Move to ubuntu eaon for bpftrace 0.9.2

Author: dalehamel

Makefile

@@ -10,29 +10,14 @@ GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 
 IMAGE_NAME_INIT        ?= quay.io/iovisor/kubectl-trace-init
 IMAGE_NAME             ?= quay.io/iovisor/kubectl-trace-bpftrace
-IMAGE_NAME_ALPINE      ?= quay.io/iovisor/kubectl-trace-bpftrace-alpine
-IMAGE_NAME_UBUNTU      ?= quay.io/iovisor/kubectl-trace-bpftrace-ubuntu
-IMAGE_NAME_BASE        ?= quay.io/iovisor/kubectl-trace-bpftrace-base
-IMAGE_NAME_BASE_ALPINE ?= quay.io/iovisor/kubectl-trace-bpftrace-base-alpine
-IMAGE_NAME_BASE_UBUNTU ?= quay.io/iovisor/kubectl-trace-bpftrace-base-ubuntu
 
 IMAGE_TRACERUNNER_BRANCH        := $(IMAGE_NAME):$(GIT_BRANCH_CLEAN)
 IMAGE_TRACERUNNER_COMMIT        := $(IMAGE_NAME):$(GIT_COMMIT)
-IMAGE_TRACERUNNER_BRANCH_ALPINE := $(IMAGE_NAME_ALPINE):$(GIT_BRANCH_CLEAN)
-IMAGE_TRACERUNNER_COMMIT_ALPINE := $(IMAGE_NAME_ALPINE):$(GIT_COMMIT)
-IMAGE_TRACERUNNER_BRANCH_UBUNTU := $(IMAGE_NAME_UBUNTU):$(GIT_BRANCH_CLEAN)
-IMAGE_TRACERUNNER_COMMIT_UBUNTU := $(IMAGE_NAME_UBUNTU):$(GIT_COMMIT)
-
 
 IMAGE_INITCONTAINER_BRANCH := $(IMAGE_NAME_INIT):$(GIT_BRANCH_CLEAN)
 IMAGE_INITCONTAINER_COMMIT := $(IMAGE_NAME_INIT):$(GIT_COMMIT)
 IMAGE_INITCONTAINER_LATEST := $(IMAGE_NAME_INIT):latest
 
-BPFTRACESHA ?= 49ff42b4e311794cddad24a848b3c225a1b61804# v0.9
-IMAGE_BPFTRACE_BASE        := $(IMAGE_NAME_BASE):$(BPFTRACESHA)
-IMAGE_BPFTRACE_BASE_ALPINE := $(IMAGE_NAME_BASE)-alpine:$(BPFTRACESHA)
-IMAGE_BPFTRACE_BASE_UBUNTU := $(IMAGE_NAME_BASE)-ubuntu:$(BPFTRACESHA)
-
 IMAGE_BUILD_FLAGS ?= "--no-cache"
 
 LDFLAGS := -ldflags '-X github.com/iovisor/kubectl-trace/pkg/version.buildTime=$(shell date +%s) -X github.com/iovisor/kubectl-trace/pkg/version.gitCommit=${GIT_COMMIT} -X github.com/iovisor/kubectl-trace/pkg/cmd.ImageNameTag=${IMAGE_TRACERUNNER_COMMIT} -X github.com/iovisor/kubectl-trace/pkg/cmd.InitImageNameTag=${IMAGE_INITCONTAINER_COMMIT}'
@@ -54,26 +39,6 @@ ${trace_runner}:
 clean:
 	rm -Rf _output
 
-.PHONY: image/build-alpine
-image/build-alpine:
-	$(DOCKER) build \
-		--build-arg bpftracesha=$(BPFTRACESHA) \
-		--build-arg imagenamebase="$(IMAGE_NAME_BASE_ALPINE)" \
-		$(IMAGE_BUILD_FLAGS) \
-		-t "$(IMAGE_TRACERUNNER_BRANCH_ALPINE)" \
-		-f build/Dockerfile.tracerunner-alpine .
-	$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH_ALPINE)" $(IMAGE_TRACERUNNER_COMMIT_ALPINE)
-
-.PHONY: image/build-ubuntu
-image/build-ubuntu:
-	$(DOCKER) build \
-		--build-arg bpftracesha=$(BPFTRACESHA) \
-		--build-arg imagenamebase="$(IMAGE_NAME_BASE_UBUNTU)" \
-		$(IMAGE_BUILD_FLAGS) \
-		-t "$(IMAGE_TRACERUNNER_BRANCH_UBUNTU)" \
-		-f build/Dockerfile.tracerunner-ubuntu .
-	$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH_UBUNTU) $(IMAGE_TRACERUNNER_COMMIT_UBUNTU)
-
 .PHONY: image/build-init
 image/build-init:
 	$(DOCKER) build \
@@ -83,9 +48,14 @@ image/build-init:
 	$(DOCKER) tag $(IMAGE_INITCONTAINER_BRANCH) $(IMAGE_INITCONTAINER_COMMIT)
 
 .PHONY: image/build
-image/build: image/build-ubuntu
-	$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH_UBUNTU)" $(IMAGE_TRACERUNNER_BRANCH)
-	$(DOCKER) tag "$(IMAGE_TRACERUNNER_COMMIT_UBUNTU)" $(IMAGE_TRACERUNNER_COMMIT)
+image/build:
+	$(DOCKER) build \
+		$(IMAGE_BUILD_FLAGS) \
+		-t "$(IMAGE_TRACERUNNER_BRANCH)" \
+		-f build/Dockerfile.tracerunner .
+	$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH) $(IMAGE_TRACERUNNER_COMMIT)
+	$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH)" $(IMAGE_TRACERUNNER_BRANCH)
+
 
 .PHONY: image/push
 image/push:
@@ -108,19 +78,3 @@ test:
 .PHONY: integration
 integration:
 	TEST_KUBECTLTRACE_BINARY=$(shell pwd)/$(kubectl_trace) $(GO) test ${LDFLAGS} -v ./integration/...
-
-.PHONY: bpftraceimage/build-alpine
-bpftraceimage/build-alpine:
-	$(DOCKER) build --build-arg bpftracesha=$(BPFTRACESHA) $(IMAGE_BUILD_FLAGS) -t "$(IMAGE_BPFTRACE_BASE_ALPINE)" -f build/Dockerfile.bpftracebase-alpine .
-
-.PHONY: bpftraceimage/build-ubuntu
-bpftraceimage/build-ubuntu:
-	$(DOCKER) build --build-arg bpftracesha=$(BPFTRACESHA) $(IMAGE_BUILD_FLAGS) -t "$(IMAGE_BPFTRACE_BASE_UBUNTU)" -f build/Dockerfile.bpftracebase-ubuntu .
-
-.PHONY: bpftraceimage/build
-bpftraceimage/build: bpftraceimage/build-ubuntu
-	$(DOCKER) tag "$(IMAGE_BPFTRACE_BASE_UBUNTU)" $(IMAGE_BPFTRACE_BASE)
-
-.PHONY: bpftraceimage/push
-bpftraceimage/push:
-	$(DOCKER) push $(IMAGE_BPFTRACE_BASE)

build/Dockerfile.bpftracebase-alpine

@@ -0,0 +1,18 @@
+FROM golang:1.11.4-stretch as gobuilder
+
+RUN apt-get update
+RUN apt-get install -y make bash git
+
+ADD . /go/src/github.com/iovisor/kubectl-trace
+WORKDIR /go/src/github.com/iovisor/kubectl-trace
+
+RUN make _output/bin/trace-runner
+
+FROM ubuntu:19.10
+
+RUN apt-get update && apt-get install -y bpftrace && \
+                   rm -rf /var/lib/apt/lists/* && apt-get clean
+
+COPY --from=gobuilder /go/src/github.com/iovisor/kubectl-trace/_output/bin/trace-runner /bin/trace-runner
+
+ENTRYPOINT ["/bin/trace-runner"]