From 2548bb06a06354a0ca6931f5773f5f83d989670f Mon Sep 17 00:00:00 2001 From: yhua Date: Tue, 25 Oct 2016 15:45:55 +0800 Subject: [PATCH] improve make clean user interactions and fix one dir issue for golang image build --- Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f82fa432c..6cd0054fd 100644 --- a/Makefile +++ b/Makefile @@ -104,8 +104,8 @@ GOIMAGEBUILD=$(GOIMAGEBUILDCMD) build GOBUILDPATH_UI=$(GOBUILDPATH)/src/ui GOBUILDPATH_JOBSERVICE=$(GOBUILDPATH)/src/jobservice GOBUILDMAKEPATH=$(GOBUILDPATH)/make -GOBUILDMAKEPATH_UI=$(GOBUILDMAKEPATH)/ui -GOBUILDMAKEPATH_JOBSERVICE=$(GOBUILDMAKEPATH)/jobservice +GOBUILDMAKEPATH_UI=$(GOBUILDMAKEPATH)/dev/ui +GOBUILDMAKEPATH_JOBSERVICE=$(GOBUILDMAKEPATH)/dev/jobservice # binary UISOURCECODE=$(SRCPATH)/ui @@ -345,9 +345,18 @@ cleanpackage: then rm $(BUILDPATH)/harbor-online-installer-$(VERSIONTAG).tgz ; fi @if [ -f $(BUILDPATH)/harbor-offline-installer-$(VERSIONTAG).tgz ] ; \ then rm $(BUILDPATH)/harbor-offline-installer-$(VERSIONTAG).tgz ; fi - -.PHONY: clean -clean: cleanbinary cleanimage cleandockercomposefile cleanversiontag cleanpackage + +.PHONY: cleanall +cleanall: cleanbinary cleanimage cleandockercomposefile cleanversiontag cleanpackage + +clean: + @echo " make cleanall: remove binary, Harbor images, specific version docker-compose" + @echo " file, specific version tag, online and offline install package" + @echo " make cleanbinary: remove ui and jobservice binary" + @echo " make cleanimage: remove Harbor images" + @echo " make cleandockercomposefile: remove specific version docker-compose" + @echo " make cleanversiontag: cleanpackageremove specific version tag" + @echo " make cleanpackage: remove online and offline install package" all: install