From 200c352c35fb125fa0ffee98498d9e4086aadd30 Mon Sep 17 00:00:00 2001 From: Ziming Zhang Date: Tue, 3 Mar 2020 15:22:21 +0800 Subject: [PATCH] feat(cicd) use unified version as tag name Signed-off-by: Ziming Zhang --- Makefile | 11 ++++++----- make/photon/Makefile | 14 +++++++------- make/photon/core/Dockerfile | 1 + make/photon/prepare/utils/docker_compose.py | 12 ++++++------ tests/ci/ut_install.sh | 1 - tests/docker-compose.test.yml | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 531e5808a..a56c32b77 100644 --- a/Makefile +++ b/Makefile @@ -260,7 +260,8 @@ DOCKERSAVE_PARA=$(DOCKER_IMAGE_NAME_PREPARE):$(VERSIONTAG) \ $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ $(DOCKERIMAGENAME_REGCTL):$(VERSIONTAG) \ goharbor/redis-photon:$(REDISVERSION) \ - goharbor/nginx-photon:$(NGINXVERSION) goharbor/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG) + goharbor/nginx-photon:$(NGINXVERSION) \ + goharbor/registry-photon:$(VERSIONTAG) PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(PKGVERSIONTAG).tgz \ $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \ @@ -279,20 +280,20 @@ PACKAGE_ONLINE_PARA=-zcvf harbor-online-installer-$(PKGVERSIONTAG).tgz \ DOCKERCOMPOSE_FILE_OPT=-f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) ifeq ($(NOTARYFLAG), true) - DOCKERSAVE_PARA+= goharbor/notary-server-photon:$(NOTARYVERSION)-$(VERSIONTAG) goharbor/notary-signer-photon:$(NOTARYVERSION)-$(VERSIONTAG) + DOCKERSAVE_PARA+= goharbor/notary-server-photon:$(VERSIONTAG) goharbor/notary-signer-photon:$(VERSIONTAG) endif ifeq ($(CLAIRFLAG), true) - DOCKERSAVE_PARA+= goharbor/clair-photon:$(CLAIRVERSION)-$(VERSIONTAG) goharbor/clair-adapter-photon:$(CLAIRADAPTERVERSION)-$(VERSIONTAG) + DOCKERSAVE_PARA+= goharbor/clair-photon:$(VERSIONTAG) goharbor/clair-adapter-photon:$(VERSIONTAG) endif ifeq ($(TRIVYFLAG), true) - DOCKERSAVE_PARA+= goharbor/trivy-adapter-photon:$(TRIVYADAPTERVERSION)-$(VERSIONTAG) + DOCKERSAVE_PARA+= goharbor/trivy-adapter-photon:$(VERSIONTAG) endif ifeq ($(MIGRATORFLAG), true) DOCKERSAVE_PARA+= goharbor/harbor-migrator:$(MIGRATORVERSION) endif # append chartmuseum parameters if set ifeq ($(CHARTFLAG), true) - DOCKERSAVE_PARA+= $(DOCKERIMAGENAME_CHART_SERVER):$(CHARTMUSEUMVERSION)-$(VERSIONTAG) + DOCKERSAVE_PARA+= $(DOCKERIMAGENAME_CHART_SERVER):$(VERSIONTAG) endif SWAGGER_IMAGENAME=goharbor/swagger diff --git a/make/photon/Makefile b/make/photon/Makefile index ada398107..b1abb02aa 100644 --- a/make/photon/Makefile +++ b/make/photon/Makefile @@ -146,7 +146,7 @@ _build_clair: cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION) && cd - ; \ fi ; \ echo "building clair container for photon..." ; \ - $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -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):$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_CLAIR)/binary; \ echo "Done." ; \ fi @@ -163,7 +163,7 @@ _build_clair_adapter: echo "Building Clair adapter container for photon..." ; \ $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) \ -f $(DOCKERFILEPATH_CLAIR_ADAPTER)/$(DOCKERFILENAME_CLAIR_ADAPTER) \ - -t $(DOCKERIMAGENAME_CLAIR_ADAPTER):$(CLAIRADAPTERVERSION)-$(VERSIONTAG) . ; \ + -t $(DOCKERIMAGENAME_CLAIR_ADAPTER):$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_CLAIR_ADAPTER)/binary; \ echo "Done." ; \ fi @@ -184,7 +184,7 @@ _build_trivy_adapter: $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) \ --build-arg trivy_version=$(TRIVYVERSION) \ -f $(DOCKERFILEPATH_TRIVY_ADAPTER)/$(DOCKERFILENAME_TRIVY_ADAPTER) \ - -t $(DOCKERIMAGENAME_TRIVY_ADAPTER):$(TRIVYADAPTERVERSION)-$(VERSIONTAG) . ; \ + -t $(DOCKERIMAGENAME_TRIVY_ADAPTER):$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_TRIVY_ADAPTER)/binary; \ echo "Done." ; \ fi @@ -198,7 +198,7 @@ _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) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -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):$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_CHART_SERVER)/binary; \ echo "Done." ; \ fi @@ -218,8 +218,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) --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) . ; \ + chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-signer && $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_NOTARYSIGNER)/$(DOCKERFILENAME_NOTARYSIGNER) -t $(DOCKERIMAGENAME_NOTARYSIGNER):$(VERSIONTAG) . ; \ + chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-server && $(DOCKERBUILD) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -f $(DOCKERFILEPATH_NOTARYSERVER)/$(DOCKERFILENAME_NOTARYSERVER) -t $(DOCKERIMAGENAME_NOTARYSERVER):$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_NOTARY)/binary; \ echo "Done."; \ fi @@ -232,7 +232,7 @@ _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) --build-arg harbor_base_image_version=$(BASEIMAGETAG) -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):$(VERSIONTAG) . @echo "Done." _build_registryctl: diff --git a/make/photon/core/Dockerfile b/make/photon/core/Dockerfile index e515aa47e..6ea45e847 100644 --- a/make/photon/core/Dockerfile +++ b/make/photon/core/Dockerfile @@ -10,3 +10,4 @@ RUN chmod u+x /harbor/harbor_core WORKDIR /harbor/ USER harbor ENTRYPOINT ["/harbor/harbor_core"] +COPY make/photon/prepare/versions /harbor/ diff --git a/make/photon/prepare/utils/docker_compose.py b/make/photon/prepare/utils/docker_compose.py index 6667e82fb..9994eaf6e 100644 --- a/make/photon/prepare/utils/docker_compose.py +++ b/make/photon/prepare/utils/docker_compose.py @@ -20,13 +20,13 @@ def prepare_docker_compose(configs, with_clair, with_trivy, with_notary, with_ch rendering_variables = { 'version': VERSION_TAG, - 'reg_version': "{}-{}".format(REGISTRY_VERSION, VERSION_TAG), + 'reg_version': VERSION_TAG, 'redis_version': VERSION_TAG, - 'notary_version': '{}-{}'.format(NOTARY_VERSION, VERSION_TAG), - 'clair_version': '{}-{}'.format(CLAIR_VERSION, VERSION_TAG), - 'clair_adapter_version': '{}-{}'.format(CLAIR_ADAPTER_VERSION, VERSION_TAG), - 'trivy_adapter_version': '{}-{}'.format(TRIVY_ADAPTER_VERSION, VERSION_TAG), - 'chartmuseum_version': '{}-{}'.format(CHARTMUSEUM_VERSION, VERSION_TAG), + 'notary_version': VERSION_TAG, + 'clair_version': VERSION_TAG, + 'clair_adapter_version': VERSION_TAG, + 'trivy_adapter_version': VERSION_TAG, + 'chartmuseum_version': VERSION_TAG, 'data_volume': configs['data_volume'], 'log_location': configs['log_location'], 'protocol': configs['protocol'], diff --git a/tests/ci/ut_install.sh b/tests/ci/ut_install.sh index 2c795932b..84d5939c2 100755 --- a/tests/ci/ut_install.sh +++ b/tests/ci/ut_install.sh @@ -31,7 +31,6 @@ sudo ./tests/testprepare.sh cd tests && sudo ./ldapprepare.sh && cd .. env docker images -sudo sed -i "s/__reg_version__/${REG_VERSION}-dev/g" ./make/docker-compose.test.yml sudo sed -i 's/__version__/dev/g' ./make/docker-compose.test.yml cat ./make/docker-compose.test.yml sudo mkdir -p ./make/common/config/registry/ && sudo mv ./tests/reg_config.yml ./make/common/config/registry/config.yml diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml index 1e3ea4f82..e8604b09a 100644 --- a/tests/docker-compose.test.yml +++ b/tests/docker-compose.test.yml @@ -1,7 +1,7 @@ version: '2' services: registry: - image: goharbor/registry-photon:__reg_version__ + image: goharbor/registry-photon:__version__ restart: always volumes: - /data/registry:/storage