Improved the local build process.

Signed-off-by: Hermann Mayer <[email protected]>

3.7/Makefile

@@ -12,7 +12,6 @@ CANONICAL_NAME ?= kafka
 IMAGE_NAME ?= hausgold/$(CANONICAL_NAME)
 IMAGE_REF ?= 3.7
 IMAGE_URI := $(IMAGE_NAME):$(IMAGE_REF)
-TEST_CONTAINER_NAME ?= $(CANONICAL_NAME)-test
 
 # Host binaries
 CURL ?= curl
@@ -33,7 +32,7 @@ define retry
 endef
 
 all:
-	# mDNS enabled wurstmeister/kafka-docker
+	# mDNS enabled apache/kafka
 	#
 	# build          Build a development snapshot of the image
 	# test           Test the built Docker image
@@ -44,7 +43,7 @@ all:
 
 build: clean
 	# Build the Docker image
-	@$(TIME) $(DOCKER) build --no-cache -t "$(IMAGE_NAME):dev" .
+	@$(TIME) $(DOCKER) build --no-cache -t "$(IMAGE_URI)" .
 
 test:
 	# Test the built Docker image
@@ -53,13 +52,12 @@ test:
 
 publish:
 	# Push the new Docker image to the registry
-	@$(DOCKER) tag "$(IMAGE_NAME):dev" "$(IMAGE_URI)"
 	@$(call retry,$(TIME) $(SHELL) -c '$(DOCKER) push $(IMAGE_URI)')
 
 shell:
 	# Start an individual test session of the image
-	@$(DOCKER) run --rm -it "$(IMAGE_NAME):dev" bash
+	@$(DOCKER) run --rm -it "$(IMAGE_URI)" bash
 
 clean:
 	# Clean the current development snapshot
-	@$(DOCKER) rmi --force "$(IMAGE_NAME):dev" || true
+	@$(DOCKER) rmi --force "$(IMAGE_URI)" || true