From 7713764aec8b45e9080f98dd45970ef92ea10b2b Mon Sep 17 00:00:00 2001 From: wangyan Date: Thu, 9 Aug 2018 23:16:59 -0700 Subject: [PATCH] Batch update docker image namespace to goharbor This commit is to move all the images of harbor from vmware to goharbor --- .travis.yml | 2 +- Makefile | 32 ++++++++++++++--------------- make/docker-compose.chartmuseum.tpl | 2 +- make/docker-compose.clair.tpl | 2 +- make/docker-compose.notary.tpl | 4 ++-- make/docker-compose.tpl | 18 ++++++++-------- make/ha/docker-compose.clair.tpl | 2 +- make/ha/docker-compose.tpl | 12 +++++------ make/install.sh | 2 +- make/prepare | 4 ++-- tests/docker-compose.test.yml | 6 +++--- tests/integration.sh | 4 ++-- tests/resources/Harbor-Util.robot | 6 +++--- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dc4edd1c..ecdcd26e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: - sudo mkdir -p /harbor - sudo mv ./VERSION /harbor/UIVERSION - sudo service postgresql stop - - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.6.0 + - sudo make run_clarity_ut CLARITYIMAGE=goharbor/harbor-clarity-ui-builder:1.6.0 - cat ./src/ui_ng/npm-ut-test-results - sudo ./tests/testprepare.sh - sudo make -f make/photon/Makefile _build_db _build_registry -e VERSIONTAG=dev -e CLAIRDBVERSION=dev -e REGISTRYVERSION=v2.6.2 diff --git a/Makefile b/Makefile index c51caf1fd..f2f5ec680 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ REDISVERSION=$(VERSIONTAG) CHARTMUSEUMVERSION=v0.7.1 #clarity parameters -CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag] +CLARITYIMAGE=goharbor/harbor-clarity-ui-builder[:tag] CLARITYSEEDPATH=/harbor_src CLARITYUTPATH=${CLARITYSEEDPATH}/ui_ng/lib CLARITYBUILDSCRIPT=/entrypoint.sh @@ -184,14 +184,14 @@ DOCKERFILEPATH_COMMON=$(MAKEPATH)/common DOCKERFILE_CLARITY=$(MAKEPATH)/dev/nodeclarity/Dockerfile # docker image name -DOCKERIMAGENAME_ADMINSERVER=vmware/harbor-adminserver -DOCKERIMAGENAME_UI=vmware/harbor-ui -DOCKERIMAGENAME_JOBSERVICE=vmware/harbor-jobservice -DOCKERIMAGENAME_LOG=vmware/harbor-log -DOCKERIMAGENAME_DB=vmware/harbor-db -DOCKERIMAGENAME_CLARITY=vmware/harbor-clarity-ui-builder -DOCKERIMAGENAME_CHART_SERVER=vmware/chartmuseum-photon -DOCKERIMAGENAME_REGCTL=vmware/harbor-registryctl +DOCKERIMAGENAME_ADMINSERVER=goharbor/harbor-adminserver +DOCKERIMAGENAME_UI=goharbor/harbor-ui +DOCKERIMAGENAME_JOBSERVICE=goharbor/harbor-jobservice +DOCKERIMAGENAME_LOG=goharbor/harbor-log +DOCKERIMAGENAME_DB=goharbor/harbor-db +DOCKERIMAGENAME_CLARITY=goharbor/harbor-clarity-ui-builder +DOCKERIMAGENAME_CHART_SERVER=goharbor/chartmuseum-photon +DOCKERIMAGENAME_REGCTL=goharbor/harbor-registryctl # docker-compose files DOCKERCOMPOSEFILEPATH=$(MAKEPATH) @@ -225,8 +225,8 @@ DOCKERSAVE_PARA=$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \ $(DOCKERIMAGENAME_DB):$(VERSIONTAG) \ $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ $(DOCKERIMAGENAME_REGCTL):$(VERSIONTAG) \ - vmware/redis-photon:$(REDISVERSION) \ - vmware/nginx-photon:$(NGINXVERSION) vmware/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG) + goharbor/redis-photon:$(REDISVERSION) \ + goharbor/nginx-photon:$(NGINXVERSION) goharbor/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG) PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(PKGVERSIONTAG).tgz \ $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \ @@ -245,19 +245,19 @@ PACKAGE_ONLINE_PARA=-zcvf harbor-online-installer-$(PKGVERSIONTAG).tgz \ DOCKERCOMPOSE_LIST=-f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) ifeq ($(NOTARYFLAG), true) - DOCKERSAVE_PARA+= vmware/notary-server-photon:$(NOTARYVERSION)-$(VERSIONTAG) vmware/notary-signer-photon:$(NOTARYVERSION)-$(VERSIONTAG) + DOCKERSAVE_PARA+= goharbor/notary-server-photon:$(NOTARYVERSION)-$(VERSIONTAG) goharbor/notary-signer-photon:$(NOTARYVERSION)-$(VERSIONTAG) PACKAGE_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME) PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) endif ifeq ($(CLAIRFLAG), true) - DOCKERSAVE_PARA+= vmware/clair-photon:$(CLAIRVERSION)-$(VERSIONTAG) + DOCKERSAVE_PARA+= goharbor/clair-photon:$(CLAIRVERSION)-$(VERSIONTAG) PACKAGE_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME) PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSECLAIRFILENAME) endif ifeq ($(MIGRATORFLAG), true) - DOCKERSAVE_PARA+= vmware/harbor-migrator:$(MIGRATORVERSION) + DOCKERSAVE_PARA+= goharbor/harbor-migrator:$(MIGRATORVERSION) endif # append chartmuseum parameters if set ifeq ($(CHARTFLAG), true) @@ -362,9 +362,9 @@ package_online: modify_composefile @echo "packing online package ..." @cp -r make $(HARBORPKG) @if [ -n "$(REGISTRYSERVER)" ] ; then \ - $(SEDCMD) -i 's/image\: vmware/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \ + $(SEDCMD) -i 's/image\: goharbor/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \ $(HARBORPKG)/docker-compose.yml ; \ - $(SEDCMD) -i 's/image\: vmware/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \ + $(SEDCMD) -i 's/image\: goharbor/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \ $(HARBORPKG)/ha/docker-compose.yml ; \ fi @cp LICENSE $(HARBORPKG)/LICENSE diff --git a/make/docker-compose.chartmuseum.tpl b/make/docker-compose.chartmuseum.tpl index cdd7f856d..497c4b47f 100644 --- a/make/docker-compose.chartmuseum.tpl +++ b/make/docker-compose.chartmuseum.tpl @@ -12,7 +12,7 @@ services: - redis chartmuseum: container_name: chartmuseum - image: vmware/chartmuseum-photon:__chartmuseum_version__ + image: goharbor/chartmuseum-photon:__chartmuseum_version__ restart: always networks: - harbor-chartmuseum diff --git a/make/docker-compose.clair.tpl b/make/docker-compose.clair.tpl index 62bd25dc1..757d6ad84 100644 --- a/make/docker-compose.clair.tpl +++ b/make/docker-compose.clair.tpl @@ -20,7 +20,7 @@ services: networks: - harbor-clair container_name: clair - image: vmware/clair-photon:__clair_version__ + image: goharbor/clair-photon:__clair_version__ restart: always cpu_quota: 50000 depends_on: diff --git a/make/docker-compose.notary.tpl b/make/docker-compose.notary.tpl index 9b4101b55..aabb13fad 100644 --- a/make/docker-compose.notary.tpl +++ b/make/docker-compose.notary.tpl @@ -12,7 +12,7 @@ services: aliases: - harbor-db notary-server: - image: vmware/notary-server-photon:__notary_version__ + image: goharbor/notary-server-photon:__notary_version__ container_name: notary-server restart: always networks: @@ -31,7 +31,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "notary-server" notary-signer: - image: vmware/notary-signer-photon:__notary_version__ + image: goharbor/notary-signer-photon:__notary_version__ container_name: notary-signer restart: always networks: diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl index 9f70d7413..908618c52 100644 --- a/make/docker-compose.tpl +++ b/make/docker-compose.tpl @@ -1,7 +1,7 @@ version: '2' services: log: - image: vmware/harbor-log:__version__ + image: goharbor/harbor-log:__version__ container_name: harbor-log restart: always volumes: @@ -12,7 +12,7 @@ services: networks: - harbor registry: - image: vmware/registry-photon:__reg_version__ + image: goharbor/registry-photon:__reg_version__ container_name: registry restart: always volumes: @@ -30,7 +30,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "registry" registryctl: - image: vmware/harbor-registryctl:__version__ + image: goharbor/harbor-registryctl:__version__ container_name: registryctl env_file: - ./common/config/registryctl/env @@ -51,7 +51,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "registryctl" postgresql: - image: vmware/harbor-db:__version__ + image: goharbor/harbor-db:__version__ container_name: harbor-db restart: always volumes: @@ -68,7 +68,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "postgresql" adminserver: - image: vmware/harbor-adminserver:__version__ + image: goharbor/harbor-adminserver:__version__ container_name: harbor-adminserver env_file: - ./common/config/adminserver/env @@ -87,7 +87,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "adminserver" ui: - image: vmware/harbor-ui:__version__ + image: goharbor/harbor-ui:__version__ container_name: harbor-ui env_file: - ./common/config/ui/env @@ -111,7 +111,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "ui" jobservice: - image: vmware/harbor-jobservice:__version__ + image: goharbor/harbor-jobservice:__version__ container_name: harbor-jobservice env_file: - ./common/config/jobservice/env @@ -131,7 +131,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "jobservice" redis: - image: vmware/redis-photon:__redis_version__ + image: goharbor/redis-photon:__redis_version__ container_name: redis restart: always volumes: @@ -146,7 +146,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "redis" proxy: - image: vmware/nginx-photon:__nginx_version__ + image: goharbor/nginx-photon:__nginx_version__ container_name: nginx restart: always volumes: diff --git a/make/ha/docker-compose.clair.tpl b/make/ha/docker-compose.clair.tpl index 108ab5347..e6b250eda 100644 --- a/make/ha/docker-compose.clair.tpl +++ b/make/ha/docker-compose.clair.tpl @@ -15,7 +15,7 @@ services: networks: - harbor-clair container_name: clair - image: vmware/clair-photon:__clair_version__ + image: goharbor/clair-photon:__clair_version__ restart: always cpu_quota: 150000 depends_on: diff --git a/make/ha/docker-compose.tpl b/make/ha/docker-compose.tpl index 38a14678f..9bc879127 100644 --- a/make/ha/docker-compose.tpl +++ b/make/ha/docker-compose.tpl @@ -1,7 +1,7 @@ version: '2' services: log: - image: vmware/harbor-log:__version__ + image: goharbor/harbor-log:__version__ container_name: harbor-log restart: always volumes: @@ -12,7 +12,7 @@ services: networks: - harbor registry: - image: vmware/registry-photon:__reg_version__ + image: goharbor/registry-photon:__reg_version__ container_name: registry restart: always volumes: @@ -32,7 +32,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "registry" adminserver: - image: vmware/harbor-adminserver:__version__ + image: goharbor/harbor-adminserver:__version__ container_name: harbor-adminserver env_file: - ./common/config/adminserver/env @@ -51,7 +51,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "adminserver" ui: - image: vmware/harbor-ui:__version__ + image: goharbor/harbor-ui:__version__ container_name: harbor-ui env_file: - ./common/config/ui/env @@ -75,7 +75,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "ui" jobservice: - image: vmware/harbor-jobservice:__version__ + image: goharbor/harbor-jobservice:__version__ container_name: harbor-jobservice env_file: - ./common/config/jobservice/env @@ -95,7 +95,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "jobservice" proxy: - image: vmware/nginx-photon:__nginx_version__ + image: goharbor/nginx-photon:__nginx_version__ container_name: nginx restart: always volumes: diff --git a/make/install.sh b/make/install.sh index 7cba8e84c..217f4ecba 100755 --- a/make/install.sh +++ b/make/install.sh @@ -236,5 +236,5 @@ echo "" success $"----Harbor has been installed and started successfully.---- Now you should be able to visit the admin portal at ${protocol}://${hostname}. -For more details, please visit https://github.com/vmware/harbor . +For more details, please visit https://github.com/goharbor/harbor . " diff --git a/make/prepare b/make/prepare index 1b8e7fe44..38f9f6111 100755 --- a/make/prepare +++ b/make/prepare @@ -610,8 +610,8 @@ if args.notary_mode: temp_cert_dir = os.path.join(base_dir, "cert_tmp") if not os.path.exists(temp_cert_dir): os.makedirs(temp_cert_dir) - ca_subj = "/C=US/ST=California/L=Palo Alto/O=VMware, Inc./OU=Harbor/CN=Self-signed by VMware, Inc." - cert_subj = "/C=US/ST=California/L=Palo Alto/O=VMware, Inc./OU=Harbor/CN=notarysigner" + ca_subj = "/C=US/ST=California/L=Palo Alto/O=GoHarbor/OU=Harbor/CN=Self-signed by GoHarbor" + cert_subj = "/C=US/ST=California/L=Palo Alto/O=GoHarbor/OU=Harbor/CN=notarysigner" signer_ca_cert = os.path.join(temp_cert_dir, "notary-signer-ca.crt") signer_ca_key = os.path.join(temp_cert_dir, "notary-signer-ca.key") signer_cert_path = os.path.join(temp_cert_dir, "notary-signer.crt") diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml index 84bd28d2d..697150250 100644 --- a/tests/docker-compose.test.yml +++ b/tests/docker-compose.test.yml @@ -1,7 +1,7 @@ version: '2' services: registry: - image: vmware/registry-photon:__reg_version__ + image: goharbor/registry-photon:__reg_version__ restart: always volumes: - /data/registry:/storage @@ -13,7 +13,7 @@ services: command: ["serve", "/etc/registry/config.yml"] postgres: - image: vmware/harbor-db:__version__ + image: goharbor/harbor-db:__version__ restart: always volumes: - /data/database:/var/lib/postgresql/data:z @@ -35,7 +35,7 @@ services: ports: - 8888:8080 redis: - image: vmware/redis-photon:4.0 + image: goharbor/redis-photon:4.0 restart: always volumes: - /data/redis:/data diff --git a/tests/integration.sh b/tests/integration.sh index ab2a37598..b95c8c608 100755 --- a/tests/integration.sh +++ b/tests/integration.sh @@ -70,7 +70,7 @@ container_ip=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print echo $container_ip ## --------------------------------------------- Init Version ----------------------------------------------- -buildinfo=$(drone build info vmware/harbor $DRONE_BUILD_NUMBER) +buildinfo=$(drone build info goharbor/harbor $DRONE_BUILD_NUMBER) echo $buildinfo git_commit=$(git rev-parse --short=8 HEAD) @@ -122,7 +122,7 @@ function publishImage { docker images docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD # rename the images with tag "dev" and push to Docker Hub - docker images | sed -n "s|\(vmware/[-._a-z0-9]*\)\s*\(.*$Harbor_Assets_Version\).*|docker tag \1:\2 \1:dev;docker push \1:dev|p" | bash + docker images | sed -n "s|\(goharbor/[-._a-z0-9]*\)\s*\(.*$Harbor_Assets_Version\).*|docker tag \1:\2 \1:dev;docker push \1:dev|p" | bash echo "Images are published successfully" docker images } diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index 4cebb07f6..3abe3284e 100644 --- a/tests/resources/Harbor-Util.robot +++ b/tests/resources/Harbor-Util.robot @@ -55,7 +55,7 @@ Down Harbor Should Be Equal As Integers ${rc} 0 Package Harbor Offline - [Arguments] ${golang_image}=golang:${GOLANG_VERSION} ${clarity_image}=vmware/harbor-clarity-ui-builder:${CLAIR_BUILDER} ${with_notary}=true ${with_clair}=true ${with_migrator}=true ${with_chartmuseum}=true + [Arguments] ${golang_image}=golang:${GOLANG_VERSION} ${clarity_image}=goharbor/harbor-clarity-ui-builder:${CLAIR_BUILDER} ${with_notary}=true ${with_clair}=true ${with_migrator}=true ${with_chartmuseum}=true Log To Console \nStart Docker Daemon Start Docker Daemon Locally Log To Console \n\nmake package_offline VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} UIVERSIONTAG=%{Harbor_UI_Version} GOBUILDIMAGE=${golang_image} COMPILETAG=compile_golangimage CLARITYIMAGE=${clarity_image} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= @@ -65,7 +65,7 @@ Package Harbor Offline Should Be Equal As Integers ${rc} 0 Package Harbor Online - [Arguments] ${golang_image}=golang:${GOLANG_VERSION} ${clarity_image}=vmware/harbor-clarity-ui-builder:${CLAIR_BUILDER} ${with_notary}=true ${with_clair}=true ${with_migrator}=true ${with_chartmuseum}=true + [Arguments] ${golang_image}=golang:${GOLANG_VERSION} ${clarity_image}=goharbor/harbor-clarity-ui-builder:${CLAIR_BUILDER} ${with_notary}=true ${with_clair}=true ${with_migrator}=true ${with_chartmuseum}=true Log To Console \nStart Docker Daemon Start Docker Daemon Locally Log To Console \nmake package_online VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} UIVERSIONTAG=%{Harbor_UI_Version} GOBUILDIMAGE=${golang_image} COMPILETAG=compile_golangimage CLARITYIMAGE=${clarity_image} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= @@ -150,7 +150,7 @@ Prepare Cert Should Be Equal As Integers ${rc} 0 Compile and Up Harbor With Source Code - [Arguments] ${golang_image}=golang:${GOLANG_VERSION} ${clarity_image}=vmware/harbor-clarity-ui-builder:${CLAIR_BUILDER} ${with_notary}=true ${with_clair}=true ${with_chartmuseum}=true + [Arguments] ${golang_image}=golang:${GOLANG_VERSION} ${clarity_image}=goharbor/harbor-clarity-ui-builder:${CLAIR_BUILDER} ${with_notary}=true ${with_clair}=true ${with_chartmuseum}=true ${rc} ${output}= Run And Return Rc And Output docker pull ${clarity_image} Log ${output} Should Be Equal As Integers ${rc} 0