some makefile cleanups

Author: dalehamel

Makefile

@@ -8,15 +8,14 @@ GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),${COMMIT
 GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 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_NAME_INIT ?= quay.io/iovisor/kubectl-trace-init
-
 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)
@@ -29,8 +28,10 @@ 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)
+BPFTRACESHA ?= 49ff42b4e311794cddad24a848b3c225a1b61804# v0.9
+IMAGE_BPFTRACE_BASE        := $(IMAGE_NAME_BASE):$(BPFTRACESHA)
+IMAGE_BPFTRACE_BASE_APLINE := $(IMAGE_NAME_BASE)-alpine:$(BPFTRACESHA)
+IMAGE_BPFTRACE_BASE_UBUNTU := $(IMAGE_NAME_BASE)-ubuntu:$(BPFTRACESHA)
 
 IMAGE_BUILD_FLAGS ?= "--no-cache"
 
@@ -82,18 +83,14 @@ image/build-init:
 	$(DOCKER) tag $(IMAGE_INITCONTAINER_BRANCH) $(IMAGE_INITCONTAINER_COMMIT)
 
 .PHONY: image/build
-bpftraceimage/build: image/build-ubuntu
+image/build: image/build-ubuntu
 	$(DOCKER) tag "$(IMAGE_TRACERUNNER_BRANCH_UBUNTU)" $(IMAGE_TRACERUNNER_BRANCH)
 	$(DOCKER) tag "$(IMAGE_TRACERUNNER_COMMIT_UBUNTU)" $(IMAGE_TRACERUNNER_COMMIT)
 
 .PHONY: image/push
 image/push:
 	$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH)
 	$(DOCKER) push $(IMAGE_TRACERUNNER_COMMIT)
-	$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH_ALPINE)
-	$(DOCKER) push $(IMAGE_TRACERUNNER_COMMIT_ALPINE)
-	$(DOCKER) push $(IMAGE_TRACERUNNER_BRANCH_UBUNTU)
-	$(DOCKER) push $(IMAGE_TRACERUNNER_COMMIT_UBUNTU)
 	$(DOCKER) push $(IMAGE_INITCONTAINER_BRANCH)
 	$(DOCKER) push $(IMAGE_INITCONTAINER_COMMIT)