From 03e2a3ee566e1c0832bac86ad9947c840ec7d8ef Mon Sep 17 00:00:00 2001
From: yhua <a@b.com>
Date: Wed, 26 Oct 2016 13:04:52 +0800
Subject: [PATCH] remove tag in docker-compose.yml

---
 .travis.yml                                     |  2 +-
 Makefile                                        | 15 ++++++++-------
 make/{docker-compose.yml => docker-compose.tpl} |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename make/{docker-compose.yml => docker-compose.tpl} (98%)

diff --git a/.travis.yml b/.travis.yml
index 6db7ed3f7..8357bfd80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,7 +86,7 @@ script:
 
   - docker-compose -f make/docker-compose.test.yml down
   
-  - docker-compose -f make/docker-compose.yml up -d
+  - docker-compose -f make/dev/docker-compose.yml up -d
   
   - docker ps
   - go run tests/startuptest.go http://localhost/
diff --git a/Makefile b/Makefile
index 52b5ffefa..b15b8b76b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
 #
 # package_online:
 #				prepare online install package
-#			for example: make package_online -e \
+#			for example: make package_online -e DEVFLAG=flase\
 #							REGISTRYSERVER=reg-bj.eng.vmware.com \
 #							REGISTRYPROJECTNAME=harborrelease
 #						
@@ -33,13 +33,13 @@
 #				prepare offline install package
 # 
 # pushimage:	push Harbor images to specific registry server
-#			for example: make pushimage -e REGISTRYUSER=admin \
+#			for example: make pushimage -e DEVFLAG=flase REGISTRYUSER=admin \
 #							REGISTRYPASSWORD=***** \
 #							REGISTRYSERVER=reg-bj.eng.vmware.com/ \
 #							REGISTRYPROJECTNAME=harborrelease
 #				note**: need add "/" on end of REGISTRYSERVER. If not setting \
 #						this value will push images directly to dockerhub.
-#						 make pushimage -e REGISTRYUSER=vmware \
+#						 make pushimage -e DEVFLAG=flase REGISTRYUSER=vmware \
 #							REGISTRYPASSWORD=***** \
 #							REGISTRYPROJECTNAME=vmware
 #
@@ -141,6 +141,7 @@ DOCKERIMAGENAME_DB=vmware/harbor-db
 
 # docker-compose files
 DOCKERCOMPOSEFILEPATH=$(MAKEPATH)
+DOCKERCOMPOSETPLFILENAME=docker-compose.tpl
 DOCKERCOMPOSEFILENAME=docker-compose.yml
 
 # version prepare
@@ -229,8 +230,8 @@ build: build_$(BASEIMAGE)
 	
 modify_composefile: 
 	@echo "preparing tag:$(VERSIONTAG) docker-compose file..."
-	@cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml
-	@$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml
+	@cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSETPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
+	@$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
 	
 install: compile build modify_composefile
 	@echo "loading harbor images..."
@@ -249,7 +250,7 @@ package_online: modify_composefile
 	@$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \
 	          --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \
 			  --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \
-			  --exclude=$(HARBORPKG)/dev --exclude=docker-compose.yml \
+			  --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \
 			  --exclude=$(HARBORPKG)/checkenv.sh \
 			  --exclude=$(HARBORPKG)/jsminify.sh \
 			  --exclude=$(HARBORPKG)/pushimage.sh \
@@ -275,7 +276,7 @@ package_offline: compile build modify_composefile
 	@$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
 	          --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \
 			  --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \
-			  --exclude=$(HARBORPKG)/dev --exclude=docker-compose.yml \
+			  --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \
 			  --exclude=$(HARBORPKG)/checkenv.sh \
 			  --exclude=$(HARBORPKG)/jsminify.sh \
 			  --exclude=$(HARBORPKG)/pushimage.sh \
diff --git a/make/docker-compose.yml b/make/docker-compose.tpl
similarity index 98%
rename from make/docker-compose.yml
rename to make/docker-compose.tpl
index 1e7e81f71..4c5258198 100644
--- a/make/docker-compose.yml
+++ b/make/docker-compose.tpl
@@ -74,7 +74,7 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "jobservice"
   proxy:
-    image: nginx:1.9.0
+    image: nginx:1.9
     container_name: nginx
     restart: always
     volumes: