Merge pull request #3017 from ngpestelos/remove-build-image-from-Makefile

chore(builder, logger, logspout): remove unused references to BUILD_IMAGE

Author: Matthew Fisher

builder/Makefile

@@ -3,7 +3,6 @@ include ../includes.mk
 COMPONENT = builder
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
 DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
-BUILD_IMAGE := $(COMPONENT)-build
 BINARIES := extract-domain extract-types extract-version generate-buildhook get-app-config get-app-values publish-release-controller yaml2json-procfile
 BINARY_DEST_DIR := image/bin
 

logger/Makefile

@@ -2,7 +2,6 @@ include ../includes.mk
 
 COMPONENT = logger
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-BUILD_IMAGE := $(COMPONENT)-build
 DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
 BINARY_DEST_DIR = image/bin
 

logspout/Makefile

@@ -2,22 +2,20 @@ include ../includes.mk
 
 COMPONENT := logspout
 DOCKER_IMAGE := deis/$(COMPONENT)
-BUILD_IMAGE := $(DOCKER_IMAGE)-build
 RELEASE_IMAGE := $(DOCKER_IMAGE):$(BUILD_TAG)
 DEV_DOCKER_IMAGE := $(DEV_REGISTRY)/$(RELEASE_IMAGE)
 
 build: check-docker
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o image/logspout
 	docker build -t $(RELEASE_IMAGE) image
 
-clean: check-docker check-registry
+clean:
 	rm -rf image/logspout
-	docker rmi $(RELEASE_IMAGE) $(BUILD_IMAGE)
 
-full-clean: check-docker check-registry
+full-clean:
 	docker images -q $(DOCKER_IMAGE) | xargs docker rmi -f
-	docker images -q $(BUILD_IMAGE) | xargs docker rmi -f
 	docker images -q $(DEV_DOCKER_IMAGE) | xargs docker rmi -f
+	docker images -q $(RELEASE_IMAGE) | xargs docker rmi -f
 
 install: check-deisctl
 	deisctl install $(COMPONENT)