add cleanbuild

Makefile

@@ -174,7 +174,7 @@ endif
 # endif
 
 
-.PHONY: pre-build docker-build post-build build release patch-release minor-release major-release tag check-status check-release showtag show-tag \
+.PHONY: pre-build docker-build post-build build cleanbuild release patch-release minor-release major-release tag check-status check-release showtag show-tag \
 	push do-push post-push post-init update-make rmi images deploy show-deploy annotate rollback
 
 init:
@@ -182,6 +182,8 @@ init:
 
 build: init pre-build docker-build post-build
 
+cleanbuild: init pre-build docker-cleanbuild post-build
+
 pre-build:
 
 post-build:
@@ -194,6 +196,22 @@ post-init:
 	@rm .make-function
 
 docker-build:
+	docker build -t $(IMAGE):$(VERSIONHASH) $(PROJECTPATH)
+	@DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \
+	DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \
+	if [ $$DOCKER_MAJOR -eq 1 ] && [ $$DOCKER_MINOR -lt 10 ] ; then \
+		echo docker tag -f $(IMAGE):$(VERSIONHASH) $(IMAGE):latest ;\
+		docker tag -f $(IMAGE):$(VERSIONHASH) $(IMAGE):latest ;\
+		echo docker tag -f $(IMAGE):$(VERSIONHASH) $(IMAGE):$(VERSION) ;\
+		docker tag -f $(IMAGE):$(VERSIONHASH) $(IMAGE):$(VERSION) ;\
+	else \
+		echo docker tag $(IMAGE):$(VERSIONHASH) $(IMAGE):latest ;\
+		docker tag $(IMAGE):$(VERSIONHASH) $(IMAGE):latest ; \
+		echo docker tag  $(IMAGE):$(VERSIONHASH) $(IMAGE):$(VERSION) ;\
+		docker tag  $(IMAGE):$(VERSIONHASH) $(IMAGE):$(VERSION) ;\
+	fi
+
+docker-cleanbuild:
 	docker build --no-cache -t $(IMAGE):$(VERSIONHASH) $(PROJECTPATH)
 	@DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \
 	DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \