Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-29 21:54:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5578 from wy65701436/move-docker-images-2-goharbor

Browse Source 
Batch update docker image namespace to goharbor
This commit is contained in:
Daniel Jiang 2018-08-10 16:06:08 +08:00 committed by GitHub
commit d5024bfcd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -79,7 +79,7 @@ script:
- sudo mkdir -p /harbor - sudo mkdir -p /harbor
- sudo mv ./VERSION /harbor/UIVERSION - sudo mv ./VERSION /harbor/UIVERSION
- sudo service postgresql stop - 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 - cat ./src/ui_ng/npm-ut-test-results
- sudo ./tests/testprepare.sh - 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 - sudo make -f make/photon/Makefile _build_db _build_registry -e VERSIONTAG=dev -e CLAIRDBVERSION=dev -e REGISTRYVERSION=v2.6.2

32
Makefile
View File

@ -109,7 +109,7 @@ REDISVERSION=$(VERSIONTAG)
CHARTMUSEUMVERSION=v0.7.1 CHARTMUSEUMVERSION=v0.7.1
#clarity parameters #clarity parameters
CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag] CLARITYIMAGE=goharbor/harbor-clarity-ui-builder[:tag]
CLARITYSEEDPATH=/harbor_src CLARITYSEEDPATH=/harbor_src
CLARITYUTPATH=${CLARITYSEEDPATH}/ui_ng/lib CLARITYUTPATH=${CLARITYSEEDPATH}/ui_ng/lib
CLARITYBUILDSCRIPT=/entrypoint.sh CLARITYBUILDSCRIPT=/entrypoint.sh
@ -184,14 +184,14 @@ DOCKERFILEPATH_COMMON=$(MAKEPATH)/common
DOCKERFILE_CLARITY=$(MAKEPATH)/dev/nodeclarity/Dockerfile DOCKERFILE_CLARITY=$(MAKEPATH)/dev/nodeclarity/Dockerfile
# docker image name # docker image name
DOCKERIMAGENAME_ADMINSERVER=vmware/harbor-adminserver DOCKERIMAGENAME_ADMINSERVER=goharbor/harbor-adminserver
DOCKERIMAGENAME_UI=vmware/harbor-ui DOCKERIMAGENAME_UI=goharbor/harbor-ui
DOCKERIMAGENAME_JOBSERVICE=vmware/harbor-jobservice DOCKERIMAGENAME_JOBSERVICE=goharbor/harbor-jobservice
DOCKERIMAGENAME_LOG=vmware/harbor-log DOCKERIMAGENAME_LOG=goharbor/harbor-log
DOCKERIMAGENAME_DB=vmware/harbor-db DOCKERIMAGENAME_DB=goharbor/harbor-db
DOCKERIMAGENAME_CLARITY=vmware/harbor-clarity-ui-builder DOCKERIMAGENAME_CLARITY=goharbor/harbor-clarity-ui-builder
DOCKERIMAGENAME_CHART_SERVER=vmware/chartmuseum-photon DOCKERIMAGENAME_CHART_SERVER=goharbor/chartmuseum-photon
DOCKERIMAGENAME_REGCTL=vmware/harbor-registryctl DOCKERIMAGENAME_REGCTL=goharbor/harbor-registryctl
# docker-compose files # docker-compose files
DOCKERCOMPOSEFILEPATH=$(MAKEPATH) DOCKERCOMPOSEFILEPATH=$(MAKEPATH)
@ -225,8 +225,8 @@ DOCKERSAVE_PARA=$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \
$(DOCKERIMAGENAME_DB):$(VERSIONTAG) \ $(DOCKERIMAGENAME_DB):$(VERSIONTAG) \
$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
$(DOCKERIMAGENAME_REGCTL):$(VERSIONTAG) \ $(DOCKERIMAGENAME_REGCTL):$(VERSIONTAG) \
vmware/redis-photon:$(REDISVERSION) \ goharbor/redis-photon:$(REDISVERSION) \
vmware/nginx-photon:$(NGINXVERSION) vmware/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG) goharbor/nginx-photon:$(NGINXVERSION) goharbor/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG)
PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(PKGVERSIONTAG).tgz \ PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(PKGVERSIONTAG).tgz \
$(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \ $(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) DOCKERCOMPOSE_LIST=-f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
ifeq ($(NOTARYFLAG), true) 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_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME)
PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME) PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME)
endif endif
ifeq ($(CLAIRFLAG), true) ifeq ($(CLAIRFLAG), true)
DOCKERSAVE_PARA+= vmware/clair-photon:$(CLAIRVERSION)-$(VERSIONTAG) DOCKERSAVE_PARA+= goharbor/clair-photon:$(CLAIRVERSION)-$(VERSIONTAG)
PACKAGE_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME) PACKAGE_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME)
PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME) PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSECLAIRFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSECLAIRFILENAME)
endif endif
ifeq ($(MIGRATORFLAG), true) ifeq ($(MIGRATORFLAG), true)
DOCKERSAVE_PARA+= vmware/harbor-migrator:$(MIGRATORVERSION) DOCKERSAVE_PARA+= goharbor/harbor-migrator:$(MIGRATORVERSION)
endif endif
# append chartmuseum parameters if set # append chartmuseum parameters if set
ifeq ($(CHARTFLAG), true) ifeq ($(CHARTFLAG), true)
@ -362,9 +362,9 @@ package_online: modify_composefile
@echo "packing online package ..." @echo "packing online package ..."
@cp -r make $(HARBORPKG) @cp -r make $(HARBORPKG)
@if [ -n "$(REGISTRYSERVER)" ] ; then \ @if [ -n "$(REGISTRYSERVER)" ] ; then \
$(SEDCMD) -i 's/image\: vmware/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \ $(SEDCMD) -i 's/image\: goharbor/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \
$(HARBORPKG)/docker-compose.yml ; \ $(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 ; \ $(HARBORPKG)/ha/docker-compose.yml ; \
fi fi
@cp LICENSE $(HARBORPKG)/LICENSE @cp LICENSE $(HARBORPKG)/LICENSE

2
make/docker-compose.chartmuseum.tpl
View File

@ -12,7 +12,7 @@ services:
- redis - redis
chartmuseum: chartmuseum:
container_name: chartmuseum container_name: chartmuseum
image: vmware/chartmuseum-photon:__chartmuseum_version__ image: goharbor/chartmuseum-photon:__chartmuseum_version__
restart: always restart: always
networks: networks:
- harbor-chartmuseum - harbor-chartmuseum

2
make/docker-compose.clair.tpl
View File

@ -20,7 +20,7 @@ services:
networks: networks:
- harbor-clair - harbor-clair
container_name: clair container_name: clair
image: vmware/clair-photon:__clair_version__ image: goharbor/clair-photon:__clair_version__
restart: always restart: always
cpu_quota: 50000 cpu_quota: 50000
depends_on: depends_on:

4
make/docker-compose.notary.tpl
View File

@ -12,7 +12,7 @@ services:
aliases: aliases:
- harbor-db - harbor-db
notary-server: notary-server:
image: vmware/notary-server-photon:__notary_version__ image: goharbor/notary-server-photon:__notary_version__
container_name: notary-server container_name: notary-server
restart: always restart: always
networks: networks:
@ -31,7 +31,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "notary-server" tag: "notary-server"
notary-signer: notary-signer:
image: vmware/notary-signer-photon:__notary_version__ image: goharbor/notary-signer-photon:__notary_version__
container_name: notary-signer container_name: notary-signer
restart: always restart: always
networks: networks:

18
make/docker-compose.tpl
View File

@ -1,7 +1,7 @@
version: '2' version: '2'
services: services:
log: log:
image: vmware/harbor-log:__version__ image: goharbor/harbor-log:__version__
container_name: harbor-log container_name: harbor-log
restart: always restart: always
volumes: volumes:
@ -12,7 +12,7 @@ services:
networks: networks:
- harbor - harbor
registry: registry:
image: vmware/registry-photon:__reg_version__ image: goharbor/registry-photon:__reg_version__
container_name: registry container_name: registry
restart: always restart: always
volumes: volumes:
@ -30,7 +30,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "registry" tag: "registry"
registryctl: registryctl:
image: vmware/harbor-registryctl:__version__ image: goharbor/harbor-registryctl:__version__
container_name: registryctl container_name: registryctl
env_file: env_file:
- ./common/config/registryctl/env - ./common/config/registryctl/env
@ -51,7 +51,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "registryctl" tag: "registryctl"
postgresql: postgresql:
image: vmware/harbor-db:__version__ image: goharbor/harbor-db:__version__
container_name: harbor-db container_name: harbor-db
restart: always restart: always
volumes: volumes:
@ -68,7 +68,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "postgresql" tag: "postgresql"
adminserver: adminserver:
image: vmware/harbor-adminserver:__version__ image: goharbor/harbor-adminserver:__version__
container_name: harbor-adminserver container_name: harbor-adminserver
env_file: env_file:
- ./common/config/adminserver/env - ./common/config/adminserver/env
@ -87,7 +87,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "adminserver" tag: "adminserver"
ui: ui:
image: vmware/harbor-ui:__version__ image: goharbor/harbor-ui:__version__
container_name: harbor-ui container_name: harbor-ui
env_file: env_file:
- ./common/config/ui/env - ./common/config/ui/env
@ -111,7 +111,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "ui" tag: "ui"
jobservice: jobservice:
image: vmware/harbor-jobservice:__version__ image: goharbor/harbor-jobservice:__version__
container_name: harbor-jobservice container_name: harbor-jobservice
env_file: env_file:
- ./common/config/jobservice/env - ./common/config/jobservice/env
@ -131,7 +131,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "jobservice" tag: "jobservice"
redis: redis:
image: vmware/redis-photon:__redis_version__ image: goharbor/redis-photon:__redis_version__
container_name: redis container_name: redis
restart: always restart: always
volumes: volumes:
@ -146,7 +146,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "redis" tag: "redis"
proxy: proxy:
image: vmware/nginx-photon:__nginx_version__ image: goharbor/nginx-photon:__nginx_version__
container_name: nginx container_name: nginx
restart: always restart: always
volumes: volumes:

2
make/ha/docker-compose.clair.tpl
View File

@ -15,7 +15,7 @@ services:
networks: networks:
- harbor-clair - harbor-clair
container_name: clair container_name: clair
image: vmware/clair-photon:__clair_version__ image: goharbor/clair-photon:__clair_version__
restart: always restart: always
cpu_quota: 150000 cpu_quota: 150000
depends_on: depends_on:

12
make/ha/docker-compose.tpl
View File

@ -1,7 +1,7 @@
version: '2' version: '2'
services: services:
log: log:
image: vmware/harbor-log:__version__ image: goharbor/harbor-log:__version__
container_name: harbor-log container_name: harbor-log
restart: always restart: always
volumes: volumes:
@ -12,7 +12,7 @@ services:
networks: networks:
- harbor - harbor
registry: registry:
image: vmware/registry-photon:__reg_version__ image: goharbor/registry-photon:__reg_version__
container_name: registry container_name: registry
restart: always restart: always
volumes: volumes:
@ -32,7 +32,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "registry" tag: "registry"
adminserver: adminserver:
image: vmware/harbor-adminserver:__version__ image: goharbor/harbor-adminserver:__version__
container_name: harbor-adminserver container_name: harbor-adminserver
env_file: env_file:
- ./common/config/adminserver/env - ./common/config/adminserver/env
@ -51,7 +51,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "adminserver" tag: "adminserver"
ui: ui:
image: vmware/harbor-ui:__version__ image: goharbor/harbor-ui:__version__
container_name: harbor-ui container_name: harbor-ui
env_file: env_file:
- ./common/config/ui/env - ./common/config/ui/env
@ -75,7 +75,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "ui" tag: "ui"
jobservice: jobservice:
image: vmware/harbor-jobservice:__version__ image: goharbor/harbor-jobservice:__version__
container_name: harbor-jobservice container_name: harbor-jobservice
env_file: env_file:
- ./common/config/jobservice/env - ./common/config/jobservice/env
@ -95,7 +95,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "jobservice" tag: "jobservice"
proxy: proxy:
image: vmware/nginx-photon:__nginx_version__ image: goharbor/nginx-photon:__nginx_version__
container_name: nginx container_name: nginx
restart: always restart: always
volumes: volumes:

2
make/install.sh
View File

@ -236,5 +236,5 @@ echo ""
success $"----Harbor has been installed and started successfully.---- success $"----Harbor has been installed and started successfully.----
Now you should be able to visit the admin portal at ${protocol}://${hostname}. 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 .
" "

28
make/photon/Makefile
View File

@ -37,57 +37,57 @@ DOCKERFILEPATH=$(MAKEPATH)/photon
DOCKERFILEPATH_ADMINSERVER=$(DOCKERFILEPATH)/adminserver DOCKERFILEPATH_ADMINSERVER=$(DOCKERFILEPATH)/adminserver
DOCKERFILENAME_ADMINSERVER=Dockerfile DOCKERFILENAME_ADMINSERVER=Dockerfile
DOCKERIMAGENAME_ADMINSERVER=vmware/harbor-adminserver DOCKERIMAGENAME_ADMINSERVER=goharbor/harbor-adminserver
DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui
DOCKERFILENAME_UI=Dockerfile DOCKERFILENAME_UI=Dockerfile
DOCKERIMAGENAME_UI=vmware/harbor-ui DOCKERIMAGENAME_UI=goharbor/harbor-ui
DOCKERFILEPATH_JOBSERVICE=$(DOCKERFILEPATH)/jobservice DOCKERFILEPATH_JOBSERVICE=$(DOCKERFILEPATH)/jobservice
DOCKERFILENAME_JOBSERVICE=Dockerfile DOCKERFILENAME_JOBSERVICE=Dockerfile
DOCKERIMAGENAME_JOBSERVICE=vmware/harbor-jobservice DOCKERIMAGENAME_JOBSERVICE=goharbor/harbor-jobservice
DOCKERFILEPATH_LOG=$(DOCKERFILEPATH)/log DOCKERFILEPATH_LOG=$(DOCKERFILEPATH)/log
DOCKERFILENAME_LOG=Dockerfile DOCKERFILENAME_LOG=Dockerfile
DOCKERIMAGENAME_LOG=vmware/harbor-log DOCKERIMAGENAME_LOG=goharbor/harbor-log
DOCKERFILEPATH_DB=$(DOCKERFILEPATH)/db DOCKERFILEPATH_DB=$(DOCKERFILEPATH)/db
DOCKERFILENAME_DB=Dockerfile DOCKERFILENAME_DB=Dockerfile
DOCKERIMAGENAME_DB=vmware/harbor-db DOCKERIMAGENAME_DB=goharbor/harbor-db
DOCKERFILEPATH_POSTGRESQL=$(DOCKERFILEPATH)/postgresql DOCKERFILEPATH_POSTGRESQL=$(DOCKERFILEPATH)/postgresql
DOCKERFILENAME_POSTGRESQL=Dockerfile DOCKERFILENAME_POSTGRESQL=Dockerfile
DOCKERIMAGENAME_POSTGRESQL=vmware/postgresql-photon DOCKERIMAGENAME_POSTGRESQL=goharbor/postgresql-photon
DOCKERFILEPATH_CLAIR=$(DOCKERFILEPATH)/clair DOCKERFILEPATH_CLAIR=$(DOCKERFILEPATH)/clair
DOCKERFILENAME_CLAIR=Dockerfile DOCKERFILENAME_CLAIR=Dockerfile
DOCKERIMAGENAME_CLAIR=vmware/clair-photon DOCKERIMAGENAME_CLAIR=goharbor/clair-photon
DOCKERFILEPATH_NGINX=$(DOCKERFILEPATH)/nginx DOCKERFILEPATH_NGINX=$(DOCKERFILEPATH)/nginx
DOCKERFILENAME_NGINX=Dockerfile DOCKERFILENAME_NGINX=Dockerfile
DOCKERIMAGENAME_NGINX=vmware/nginx-photon DOCKERIMAGENAME_NGINX=goharbor/nginx-photon
DOCKERFILEPATH_REG=$(DOCKERFILEPATH)/registry DOCKERFILEPATH_REG=$(DOCKERFILEPATH)/registry
DOCKERFILENAME_REG=Dockerfile DOCKERFILENAME_REG=Dockerfile
DOCKERIMAGENAME_REG=vmware/registry-photon DOCKERIMAGENAME_REG=goharbor/registry-photon
DOCKERFILEPATH_REGISTRYCTL=$(DOCKERFILEPATH)/registryctl DOCKERFILEPATH_REGISTRYCTL=$(DOCKERFILEPATH)/registryctl
DOCKERFILENAME_REGISTRYCTL=Dockerfile DOCKERFILENAME_REGISTRYCTL=Dockerfile
DOCKERIMAGENAME_REGISTRYCTL=vmware/harbor-registryctl DOCKERIMAGENAME_REGISTRYCTL=goharbor/harbor-registryctl
DOCKERFILEPATH_NOTARY=$(DOCKERFILEPATH)/notary DOCKERFILEPATH_NOTARY=$(DOCKERFILEPATH)/notary
DOCKERFILENAME_NOTARYSIGNER=signer.Dockerfile DOCKERFILENAME_NOTARYSIGNER=signer.Dockerfile
DOCKERIMAGENAME_NOTARYSIGNER=vmware/notary-signer-photon DOCKERIMAGENAME_NOTARYSIGNER=goharbor/notary-signer-photon
DOCKERFILENAME_NOTARYSERVER=server.Dockerfile DOCKERFILENAME_NOTARYSERVER=server.Dockerfile
DOCKERIMAGENAME_NOTARYSERVER=vmware/notary-server-photon DOCKERIMAGENAME_NOTARYSERVER=goharbor/notary-server-photon
DOCKERFILEPATH_REDIS=$(DOCKERFILEPATH)/redis DOCKERFILEPATH_REDIS=$(DOCKERFILEPATH)/redis
DOCKERFILENAME_REDIS=Dockerfile DOCKERFILENAME_REDIS=Dockerfile
DOCKERIMAGENAME_REDIS=vmware/redis-photon DOCKERIMAGENAME_REDIS=goharbor/redis-photon
DOCKERFILEPATH_MIGRATOR=$(TOOLSPATH)/migration DOCKERFILEPATH_MIGRATOR=$(TOOLSPATH)/migration
DOCKERFILENAME_MIGRATOR=Dockerfile DOCKERFILENAME_MIGRATOR=Dockerfile
DOCKERIMAGENAME_MIGRATOR=vmware/harbor-migrator DOCKERIMAGENAME_MIGRATOR=goharbor/harbor-migrator
# for chart server (chartmuseum) # for chart server (chartmuseum)
DOCKERFILEPATH_CHART_SERVER=$(DOCKERFILEPATH)/chartserver DOCKERFILEPATH_CHART_SERVER=$(DOCKERFILEPATH)/chartserver

4
make/prepare
View File

@ -610,8 +610,8 @@ if args.notary_mode:
temp_cert_dir = os.path.join(base_dir, "cert_tmp") temp_cert_dir = os.path.join(base_dir, "cert_tmp")
if not os.path.exists(temp_cert_dir): if not os.path.exists(temp_cert_dir):
os.makedirs(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." 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=VMware, Inc./OU=Harbor/CN=notarysigner" 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_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_ca_key = os.path.join(temp_cert_dir, "notary-signer-ca.key")
signer_cert_path = os.path.join(temp_cert_dir, "notary-signer.crt") signer_cert_path = os.path.join(temp_cert_dir, "notary-signer.crt")

6
tests/docker-compose.test.yml
View File

@ -1,7 +1,7 @@
version: '2' version: '2'
services: services:
registry: registry:
image: vmware/registry-photon:__reg_version__ image: goharbor/registry-photon:__reg_version__
restart: always restart: always
volumes: volumes:
- /data/registry:/storage - /data/registry:/storage
@ -13,7 +13,7 @@ services:
command: command:
["serve", "/etc/registry/config.yml"] ["serve", "/etc/registry/config.yml"]
postgres: postgres:
image: vmware/harbor-db:__version__ image: goharbor/harbor-db:__version__
restart: always restart: always
volumes: volumes:
- /data/database:/var/lib/postgresql/data:z - /data/database:/var/lib/postgresql/data:z
@ -35,7 +35,7 @@ services:
ports: ports:
- 8888:8080 - 8888:8080
redis: redis:
image: vmware/redis-photon:4.0 image: goharbor/redis-photon:4.0
restart: always restart: always
volumes: volumes:
- /data/redis:/data - /data/redis:/data

4
tests/integration.sh
View File

@ -70,7 +70,7 @@ container_ip=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print
echo $container_ip echo $container_ip
## --------------------------------------------- Init Version ----------------------------------------------- ## --------------------------------------------- Init Version -----------------------------------------------
buildinfo=$(drone build info vmware/harbor $DRONE_BUILD_NUMBER) buildinfo=$(drone build info goharbor/harbor $DRONE_BUILD_NUMBER)
echo $buildinfo echo $buildinfo
git_commit=$(git rev-parse --short=8 HEAD) git_commit=$(git rev-parse --short=8 HEAD)
@ -122,7 +122,7 @@ function publishImage {
docker images docker images
docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
# rename the images with tag "dev" and push to Docker Hub # 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" echo "Images are published successfully"
docker images docker images
} }

6
tests/resources/Harbor-Util.robot
View File

@ -55,7 +55,7 @@ Down Harbor
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
Package Harbor Offline 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 Log To Console \nStart Docker Daemon
Start Docker Daemon Locally 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= 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 Should Be Equal As Integers ${rc} 0
Package Harbor Online 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 Log To Console \nStart Docker Daemon
Start Docker Daemon Locally 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= 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 Should Be Equal As Integers ${rc} 0
Compile and Up Harbor With Source Code 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} ${rc} ${output}= Run And Return Rc And Output docker pull ${clarity_image}
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0