From 47793e77e34d973f9c98b2f72abd8106dceeea23 Mon Sep 17 00:00:00 2001
From: wang yan <wangyan@vmware.com>
Date: Tue, 12 Nov 2019 11:20:54 +0800
Subject: [PATCH] update base file name ane pass base version to build file

Signed-off-by: wang yan <wangyan@vmware.com>
---
 Makefile                                      |  4 +-
 make/photon/Makefile                          | 51 +++++++------------
 make/photon/chartserver/Dockerfile            |  3 +-
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/clair-adapter/Dockerfile          |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/clair/Dockerfile                  |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/core/Dockerfile                   |  1 +
 .../core/{base.Dockerfile => Dockerfile.base} |  0
 make/photon/db/Dockerfile                     |  1 +
 .../db/{base.Dockerfile => Dockerfile.base}   |  0
 make/photon/jobservice/Dockerfile             |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/log/Dockerfile                    |  1 +
 .../log/{base.Dockerfile => Dockerfile.base}  |  0
 make/photon/nginx/Dockerfile                  |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/notary-server/Dockerfile          |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/notary-signer/Dockerfile          |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/portal/Dockerfile                 |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/prepare/Dockerfile                |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/redis/Dockerfile                  |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/registry/Dockerfile               |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  0
 make/photon/registryctl/Dockerfile            |  1 +
 .../{base.Dockerfile => Dockerfile.base}      |  2 -
 tests/travis/ut_install.sh                    |  2 +-
 33 files changed, 36 insertions(+), 40 deletions(-)
 rename make/photon/chartserver/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/clair-adapter/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/clair/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/core/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/db/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/jobservice/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/log/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/nginx/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/notary-server/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/notary-signer/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/portal/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/prepare/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/redis/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/registry/{base.Dockerfile => Dockerfile.base} (100%)
 rename make/photon/registryctl/{base.Dockerfile => Dockerfile.base} (83%)

diff --git a/Makefile b/Makefile
index b6e285e46..5bfea4d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -326,9 +326,9 @@ build:
 	 -e NPM_REGISTRY=$(NPM_REGISTRY) -e BASEIMAGETAG=${BASEIMAGETAG}
 
 build_base_docker:
-	for name in chartserver clair chair-adapter core db jobservice log nginx notary-server notary-signer portal prepare redis registry registryctl; do \
+	@for name in chartserver clair clair-adapter core db jobservice log nginx notary-server notary-signer portal prepare redis registry registryctl; do \
 		echo $$name ; \
-		$(DOCKERBUILD) -f $(MAKEFILEPATH_PHOTON)/$$name/base.Dockerfile -t goharbor/harbor-$$name-base:$(BASEIMAGETAG) . ; \
+		$(DOCKERBUILD) --pull -f $(MAKEFILEPATH_PHOTON)/$$name/Dockerfile.base -t goharbor/harbor-$$name-base:$(BASEIMAGETAG) . ; \
 		$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) goharbor/harbor-$$name-base:$(BASEIMAGETAG) $(REGISTRYUSER) $(REGISTRYPASSWORD) ; \
 	done
 
diff --git a/make/photon/Makefile b/make/photon/Makefile
index 145f12b10..593123758 100644
--- a/make/photon/Makefile
+++ b/make/photon/Makefile
@@ -105,32 +105,32 @@ CHART_SERVER_BIN_NAME=chartm
 
 _build_prepare:
 	@echo "building prepare container for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_PREPARE)/$(DOCKERFILENAME_PREPARE) -t $(DOCKERIMAGENAME_PREPARE):$(VERSIONTAG) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_PREPARE)/$(DOCKERFILENAME_PREPARE) -t $(DOCKERIMAGENAME_PREPARE):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_db:
 	@echo "building db container for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_DB)/$(DOCKERFILENAME_DB) -t $(DOCKERIMAGENAME_DB):$(VERSIONTAG) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_DB)/$(DOCKERFILENAME_DB) -t $(DOCKERIMAGENAME_DB):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_portal:
 	@echo "building portal container for photon..."
-	$(DOCKERBUILD) --build-arg npm_registry=$(NPM_REGISTRY) -f $(DOCKERFILEPATH_PORTAL)/$(DOCKERFILENAME_PORTAL) -t $(DOCKERIMAGENAME_PORTAL):$(VERSIONTAG) .
+	$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) --build-arg npm_registry=$(NPM_REGISTRY) -f $(DOCKERFILEPATH_PORTAL)/$(DOCKERFILENAME_PORTAL) -t $(DOCKERIMAGENAME_PORTAL):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_core:
 	@echo "building core container for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_CORE)/$(DOCKERFILENAME_CORE) -t $(DOCKERIMAGENAME_CORE):$(VERSIONTAG) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_CORE)/$(DOCKERFILENAME_CORE) -t $(DOCKERIMAGENAME_CORE):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_jobservice:
 	@echo "building jobservice container for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_JOBSERVICE)/$(DOCKERFILENAME_JOBSERVICE) -t $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_JOBSERVICE)/$(DOCKERFILENAME_JOBSERVICE) -t $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_log:
 	@echo "building log container for photon..."
-	$(DOCKERBUILD) -f $(DOCKERFILEPATH_LOG)/$(DOCKERFILENAME_LOG) -t $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) .
+	$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_LOG)/$(DOCKERFILENAME_LOG) -t $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) .
 	@echo "Done."
 
 _build_clair:
@@ -142,7 +142,7 @@ _build_clair:
 			cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION) && cd - ; \
 		fi ; \
 		echo "building clair container for photon..." ; \
-		$(DOCKERBUILD) -f $(DOCKERFILEPATH_CLAIR)/$(DOCKERFILENAME_CLAIR) -t $(DOCKERIMAGENAME_CLAIR):$(CLAIRVERSION)-$(VERSIONTAG) . ; \
+		$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_CLAIR)/$(DOCKERFILENAME_CLAIR) -t $(DOCKERIMAGENAME_CLAIR):$(CLAIRVERSION)-$(VERSIONTAG) . ; \
 		rm -rf $(DOCKERFILEPATH_CLAIR)/binary; \
 		echo "Done." ; \
 	fi
@@ -157,7 +157,7 @@ _build_clair_adapter:
 			cd $(DOCKERFILEPATH_CLAIR_ADAPTER) && $(DOCKERFILEPATH_CLAIR_ADAPTER)/builder $(CLAIRADAPTERVERSION) && cd - ; \
 		fi ; \
 		echo "building clair adapter container for photon..." ; \
-		$(DOCKERBUILD) -f $(DOCKERFILEPATH_CLAIR_ADAPTER)/$(DOCKERFILENAME_CLAIR_ADAPTER) -t $(DOCKERIMAGENAME_CLAIR_ADAPTER):$(CLAIRADAPTERVERSION)-$(VERSIONTAG) . ; \
+		$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_CLAIR_ADAPTER)/$(DOCKERFILENAME_CLAIR_ADAPTER) -t $(DOCKERIMAGENAME_CLAIR_ADAPTER):$(CLAIRADAPTERVERSION)-$(VERSIONTAG) . ; \
 		rm -rf $(DOCKERFILEPATH_CLAIR_ADAPTER)/binary; \
 		echo "Done." ; \
 	fi
@@ -171,14 +171,14 @@ _build_chart_server:
 			cd $(DOCKERFILEPATH_CHART_SERVER) && $(DOCKERFILEPATH_CHART_SERVER)/builder $(GOBUILDIMAGE) $(CHART_SERVER_CODE_BASE) $(CHARTMUSEUMVERSION) $(CHART_SERVER_MAIN_PATH) $(CHART_SERVER_BIN_NAME) && cd - ; \
 		fi ; \
 		echo "building chartmuseum container for photon..." ; \
-		$(DOCKERBUILD) -f $(DOCKERFILEPATH_CHART_SERVER)/$(DOCKERFILENAME_CHART_SERVER) -t $(DOCKERIMAGENAME_CHART_SERVER):$(CHARTMUSEUMVERSION)-$(VERSIONTAG) . ; \
+		$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_CHART_SERVER)/$(DOCKERFILENAME_CHART_SERVER) -t $(DOCKERIMAGENAME_CHART_SERVER):$(CHARTMUSEUMVERSION)-$(VERSIONTAG) . ; \
 		rm -rf $(DOCKERFILEPATH_CHART_SERVER)/binary; \
 		echo "Done." ; \
 	fi
 
 _build_nginx:
 	@echo "building nginx container for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_NGINX)/$(DOCKERFILENAME_NGINX) -t $(DOCKERIMAGENAME_NGINX):$(NGINXVERSION) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_NGINX)/$(DOCKERFILENAME_NGINX) -t $(DOCKERIMAGENAME_NGINX):$(NGINXVERSION) .
 	@echo "Done."
 
 _build_notary:
@@ -191,8 +191,8 @@ _build_notary:
 			cd $(DOCKERFILEPATH_NOTARY) && $(DOCKERFILEPATH_NOTARY)/builder $(NOTARYVERSION) $(NOTARYMIGRATEVERSION) && cd - ; \
 		fi ; \
 		echo "building notary container for photon..."; \
-		chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-signer && $(DOCKERBUILD) -f $(DOCKERFILEPATH_NOTARYSIGNER)/$(DOCKERFILENAME_NOTARYSIGNER) -t $(DOCKERIMAGENAME_NOTARYSIGNER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \
-		chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-server && $(DOCKERBUILD) -f $(DOCKERFILEPATH_NOTARYSERVER)/$(DOCKERFILENAME_NOTARYSERVER) -t $(DOCKERIMAGENAME_NOTARYSERVER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \
+		chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-signer && $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_NOTARYSIGNER)/$(DOCKERFILENAME_NOTARYSIGNER) -t $(DOCKERIMAGENAME_NOTARYSIGNER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \
+		chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-server && $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_NOTARYSERVER)/$(DOCKERFILENAME_NOTARYSERVER) -t $(DOCKERIMAGENAME_NOTARYSERVER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \
 		rm -rf $(DOCKERFILEPATH_NOTARY)/binary; \
 		echo "Done."; \
 	fi
@@ -205,44 +205,27 @@ _build_registry:
 		cd $(DOCKERFILEPATH_REG) && $(DOCKERFILEPATH_REG)/builder $(REGISTRY_SRC_TAG) && cd - ; \
 	fi
 	@echo "building registry container for photon..."
-	@chmod 655 $(DOCKERFILEPATH_REG)/binary/registry && $(DOCKERBUILD) -f $(DOCKERFILEPATH_REG)/$(DOCKERFILENAME_REG) -t $(DOCKERIMAGENAME_REG):$(REGISTRYVERSION)-$(VERSIONTAG) .
+	@chmod 655 $(DOCKERFILEPATH_REG)/binary/registry && $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_REG)/$(DOCKERFILENAME_REG) -t $(DOCKERIMAGENAME_REG):$(REGISTRYVERSION)-$(VERSIONTAG) .
 	@echo "Done."
 
 _build_registryctl:
 	@echo "building registry controller for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_REGISTRYCTL)/$(DOCKERFILENAME_REGISTRYCTL) -t $(DOCKERIMAGENAME_REGISTRYCTL):$(VERSIONTAG) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_REGISTRYCTL)/$(DOCKERFILENAME_REGISTRYCTL) -t $(DOCKERIMAGENAME_REGISTRYCTL):$(VERSIONTAG) .
 	@rm -rf $(DOCKERFILEPATH_REG)/binary
 	@echo "Done."
 
 _build_redis:
 	@echo "building redis container for photon..."
-	@$(DOCKERBUILD) -f $(DOCKERFILEPATH_REDIS)/$(DOCKERFILENAME_REDIS) -t $(DOCKERIMAGENAME_REDIS):$(REDISVERSION) .
+	@$(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_REDIS)/$(DOCKERFILENAME_REDIS) -t $(DOCKERIMAGENAME_REDIS):$(REDISVERSION) .
 	@echo "Done."
 
 _build_migrator:
 	@if [ "$(MIGRATORFLAG)" = "true" ] ; then \
 		echo "building db migrator container for photon..."; \
-		cd $(DOCKERFILEPATH_MIGRATOR) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_MIGRATOR)/$(DOCKERFILENAME_MIGRATOR) -t $(DOCKERIMAGENAME_MIGRATOR):$(MIGRATORVERSION) . ; \
+		cd $(DOCKERFILEPATH_MIGRATOR) && $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_MIGRATOR)/$(DOCKERFILENAME_MIGRATOR) -t $(DOCKERIMAGENAME_MIGRATOR):$(MIGRATORVERSION) . ; \
 		echo "Done."; \
 	fi
 
-set_base_image_version:
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/chartserver/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/clair/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/clair-adapter/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/core/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/db/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/jobservice/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/log/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/nginx/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/notary-server/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/notary-signer/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/portal/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/prepare/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/redis/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/registry/Dockerfile
-	@$(SEDCMD) -i -e 's/\$${harbor_base_image_version}/$(BASEIMAGETAG)/' $(DOCKERFILEPATH)/registryctl/Dockerfile
-
 define _extract_archive
 	$(WGET) --timeout 30 --no-check-certificate -O- $1 | tar xvz -C $2
 endef
@@ -251,7 +234,7 @@ define _get_binary
 	$(WGET) --timeout 30 --no-check-certificate $1 -O $2
 endef
 
-build: set_base_image_version _build_prepare _build_db _build_portal _build_core _build_jobservice _build_log _build_nginx _build_registry _build_registryctl _build_notary _build_clair _build_clair_adapter _build_redis _build_migrator _build_chart_server
+build: _build_prepare _build_db _build_portal _build_core _build_jobservice _build_log _build_nginx _build_registry _build_registryctl _build_notary _build_clair _build_clair_adapter _build_redis _build_migrator _build_chart_server
 
 cleanimage:
 	@echo "cleaning image for photon..."
diff --git a/make/photon/chartserver/Dockerfile b/make/photon/chartserver/Dockerfile
index a8f2c6eb7..df7577dc9 100644
--- a/make/photon/chartserver/Dockerfile
+++ b/make/photon/chartserver/Dockerfile
@@ -1,4 +1,5 @@
-FROM goharbor/harbor-chartserver-base:${harbor_base_image_version}
+ARG harbor_base_image_version
+FROM goharbor/harbor-chartserver-base:$harbor_base_image_version
 
 COPY ./make/photon/chartserver/binary/chartm /home/chart/
 COPY ./make/photon/chartserver/docker-entrypoint.sh /home/chart/
diff --git a/make/photon/chartserver/base.Dockerfile b/make/photon/chartserver/Dockerfile.base
similarity index 100%
rename from make/photon/chartserver/base.Dockerfile
rename to make/photon/chartserver/Dockerfile.base
diff --git a/make/photon/clair-adapter/Dockerfile b/make/photon/clair-adapter/Dockerfile
index 7e11eb4d1..3d6df4f7d 100644
--- a/make/photon/clair-adapter/Dockerfile
+++ b/make/photon/clair-adapter/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-clair-adapter-base:${harbor_base_image_version}
 
 COPY ./make/photon/clair-adapter/binary/harbor-scanner-clair /clair-adapter/clair-adapter
diff --git a/make/photon/clair-adapter/base.Dockerfile b/make/photon/clair-adapter/Dockerfile.base
similarity index 100%
rename from make/photon/clair-adapter/base.Dockerfile
rename to make/photon/clair-adapter/Dockerfile.base
diff --git a/make/photon/clair/Dockerfile b/make/photon/clair/Dockerfile
index 672c67928..5b7e2183a 100644
--- a/make/photon/clair/Dockerfile
+++ b/make/photon/clair/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-clair-base:${harbor_base_image_version}
 
 COPY ./make/photon/clair/binary/clair /home/clair/
diff --git a/make/photon/clair/base.Dockerfile b/make/photon/clair/Dockerfile.base
similarity index 100%
rename from make/photon/clair/base.Dockerfile
rename to make/photon/clair/Dockerfile.base
diff --git a/make/photon/core/Dockerfile b/make/photon/core/Dockerfile
index 38bc58d78..f0778c574 100644
--- a/make/photon/core/Dockerfile
+++ b/make/photon/core/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-core-base:${harbor_base_image_version}
 
 HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1
diff --git a/make/photon/core/base.Dockerfile b/make/photon/core/Dockerfile.base
similarity index 100%
rename from make/photon/core/base.Dockerfile
rename to make/photon/core/Dockerfile.base
diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile
index 3bf48e05f..a28729e33 100644
--- a/make/photon/db/Dockerfile
+++ b/make/photon/db/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-db-base:${harbor_base_image_version}
 
 VOLUME /var/lib/postgresql/data
diff --git a/make/photon/db/base.Dockerfile b/make/photon/db/Dockerfile.base
similarity index 100%
rename from make/photon/db/base.Dockerfile
rename to make/photon/db/Dockerfile.base
diff --git a/make/photon/jobservice/Dockerfile b/make/photon/jobservice/Dockerfile
index ea18416d4..eabfdc5ef 100644
--- a/make/photon/jobservice/Dockerfile
+++ b/make/photon/jobservice/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-jobservice-base:${harbor_base_image_version}
 
 COPY ./make/photon/jobservice/harbor_jobservice /harbor/
diff --git a/make/photon/jobservice/base.Dockerfile b/make/photon/jobservice/Dockerfile.base
similarity index 100%
rename from make/photon/jobservice/base.Dockerfile
rename to make/photon/jobservice/Dockerfile.base
diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile
index f48558eab..3080c7ff5 100644
--- a/make/photon/log/Dockerfile
+++ b/make/photon/log/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-log-base:${harbor_base_image_version}
 
 COPY ./make/photon/log/rsyslog.conf /etc/rsyslog.conf
diff --git a/make/photon/log/base.Dockerfile b/make/photon/log/Dockerfile.base
similarity index 100%
rename from make/photon/log/base.Dockerfile
rename to make/photon/log/Dockerfile.base
diff --git a/make/photon/nginx/Dockerfile b/make/photon/nginx/Dockerfile
index 7409e6ebf..86a344f28 100644
--- a/make/photon/nginx/Dockerfile
+++ b/make/photon/nginx/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-nginx-base:${harbor_base_image_version}
 
 VOLUME /var/cache/nginx /var/log/nginx /run
diff --git a/make/photon/nginx/base.Dockerfile b/make/photon/nginx/Dockerfile.base
similarity index 100%
rename from make/photon/nginx/base.Dockerfile
rename to make/photon/nginx/Dockerfile.base
diff --git a/make/photon/notary-server/Dockerfile b/make/photon/notary-server/Dockerfile
index aec9d6302..a9888e6bd 100644
--- a/make/photon/notary-server/Dockerfile
+++ b/make/photon/notary-server/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-notary-server-base:${harbor_base_image_version}
 
 COPY ./make/photon/notary/migrate-patch /bin/migrate-patch
diff --git a/make/photon/notary-server/base.Dockerfile b/make/photon/notary-server/Dockerfile.base
similarity index 100%
rename from make/photon/notary-server/base.Dockerfile
rename to make/photon/notary-server/Dockerfile.base
diff --git a/make/photon/notary-signer/Dockerfile b/make/photon/notary-signer/Dockerfile
index 5f80460af..56dfc6705 100644
--- a/make/photon/notary-signer/Dockerfile
+++ b/make/photon/notary-signer/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-notary-signer-base:${harbor_base_image_version}
 
 COPY ./make/photon/notary/migrate-patch /bin/migrate-patch
diff --git a/make/photon/notary-signer/base.Dockerfile b/make/photon/notary-signer/Dockerfile.base
similarity index 100%
rename from make/photon/notary-signer/base.Dockerfile
rename to make/photon/notary-signer/Dockerfile.base
diff --git a/make/photon/portal/Dockerfile b/make/photon/portal/Dockerfile
index cc2f0dee9..5c343da25 100644
--- a/make/photon/portal/Dockerfile
+++ b/make/photon/portal/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM node:10.15.0 as nodeportal
 
 WORKDIR /build_dir
diff --git a/make/photon/portal/base.Dockerfile b/make/photon/portal/Dockerfile.base
similarity index 100%
rename from make/photon/portal/base.Dockerfile
rename to make/photon/portal/Dockerfile.base
diff --git a/make/photon/prepare/Dockerfile b/make/photon/prepare/Dockerfile
index 1afec275a..f542ae357 100644
--- a/make/photon/prepare/Dockerfile
+++ b/make/photon/prepare/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-prepare-base:${harbor_base_image_version}
 
 ENV LANG en_US.UTF-8
diff --git a/make/photon/prepare/base.Dockerfile b/make/photon/prepare/Dockerfile.base
similarity index 100%
rename from make/photon/prepare/base.Dockerfile
rename to make/photon/prepare/Dockerfile.base
diff --git a/make/photon/redis/Dockerfile b/make/photon/redis/Dockerfile
index e8e607a74..c5202f609 100644
--- a/make/photon/redis/Dockerfile
+++ b/make/photon/redis/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-redis-base:${harbor_base_image_version}
 
 VOLUME /var/lib/redis
diff --git a/make/photon/redis/base.Dockerfile b/make/photon/redis/Dockerfile.base
similarity index 100%
rename from make/photon/redis/base.Dockerfile
rename to make/photon/redis/Dockerfile.base
diff --git a/make/photon/registry/Dockerfile b/make/photon/registry/Dockerfile
index c39df6a73..94ef3af60 100644
--- a/make/photon/registry/Dockerfile
+++ b/make/photon/registry/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-registry-base:${harbor_base_image_version}
 
 COPY ./make/photon/common/install_cert.sh /home/harbor
diff --git a/make/photon/registry/base.Dockerfile b/make/photon/registry/Dockerfile.base
similarity index 100%
rename from make/photon/registry/base.Dockerfile
rename to make/photon/registry/Dockerfile.base
diff --git a/make/photon/registryctl/Dockerfile b/make/photon/registryctl/Dockerfile
index a1584ef50..42cd2bec6 100644
--- a/make/photon/registryctl/Dockerfile
+++ b/make/photon/registryctl/Dockerfile
@@ -1,3 +1,4 @@
+ARG harbor_base_image_version
 FROM goharbor/harbor-registryctl-base:${harbor_base_image_version}
 
 COPY ./make/photon/common/install_cert.sh /home/harbor
diff --git a/make/photon/registryctl/base.Dockerfile b/make/photon/registryctl/Dockerfile.base
similarity index 83%
rename from make/photon/registryctl/base.Dockerfile
rename to make/photon/registryctl/Dockerfile.base
index 0b0ad6b3b..c53686341 100644
--- a/make/photon/registryctl/base.Dockerfile
+++ b/make/photon/registryctl/Dockerfile.base
@@ -1,7 +1,5 @@
 FROM photon:2.0
 
-Label maintainer="wangyan@vmware.com"
-
 RUN tdnf install sudo -y >> /dev/null \
     && tdnf clean all \
     && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor \
diff --git a/tests/travis/ut_install.sh b/tests/travis/ut_install.sh
index eb6bc1e8b..78627df86 100644
--- a/tests/travis/ut_install.sh
+++ b/tests/travis/ut_install.sh
@@ -19,7 +19,7 @@ sleep 2
 sudo -E env "PATH=$PATH" make go_check
 sudo ./tests/hostcfg.sh
 sudo ./tests/generateCerts.sh
-sudo make -f make/photon/Makefile _build_db _build_registry _build_prepare -e VERSIONTAG=dev -e REGISTRYVERSION=${REG_VERSION}
+sudo make -f make/photon/Makefile _build_db _build_registry _build_prepare -e VERSIONTAG=dev -e REGISTRYVERSION=${REG_VERSION} -e BASEIMAGETAG=dev
 sudo MAKEPATH=$(pwd)/make ./make/prepare
 sudo mkdir -p "/data/redis"
 sudo mkdir -p /etc/core/ca/ && sudo mv ./tests/ca.crt /etc/core/ca/