Fix init container build context

Author: dalehamel

Makefile

@@ -39,6 +39,28 @@ ${trace_runner}:
 clean:
 	rm -Rf _output
 
+<<<<<<< HEAD
+=======
+.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 \
@@ -56,7 +78,6 @@ image/build:
 	$(DOCKER) tag $(IMAGE_TRACERUNNER_BRANCH) $(IMAGE_TRACERUNNER_COMMIT)
 	$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH)" $(IMAGE_TRACERUNNER_BRANCH)
 
-
 .PHONY: image/push
 image/push:
 	$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH)

init/Dockerfile.initcontainer renamed to build/Dockerfile.initcontainer

@@ -10,6 +10,6 @@ RUN apk add --update \
 
 WORKDIR /
 
-COPY /fetch-linux-headers.sh /
+COPY /init/fetch-linux-headers.sh /
 
 ENTRYPOINT [ "/fetch-linux-headers.sh" ]

init/fetch-linux-headers.sh renamed to build/init/fetch-linux-headers.sh

@@ -8,5 +8,6 @@ if [[ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
   makeopts="-e GIT_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH"
 fi
 
+$make $makeopts bpftraceimage/build # HACK since the ubuntu image isn't pushed yet
 $make $makeopts image/build
 $make $makeopts image/build-init