From 4eba01fc31c5296d0f22d62217ec3f38e10d015a Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 3 Sep 2018 17:40:26 +0800 Subject: [PATCH] Clean make file unused code and unify docker build method (#59) Signed-off-by: Yan --- .travis.yml | 2 +- Makefile | 23 +++++++-------- make/photon/Makefile | 42 ++++++++++++++-------------- make/photon/adminserver/Dockerfile | 2 +- make/photon/chartserver/Dockerfile | 4 +-- make/photon/clair/Dockerfile | 6 ++-- make/photon/db/Dockerfile | 10 +++---- make/photon/jobservice/Dockerfile | 2 +- make/photon/log/Dockerfile | 6 ++-- make/photon/notary/server.Dockerfile | 8 +++--- make/photon/notary/signer.Dockerfile | 8 +++--- make/photon/redis/Dockerfile | 4 +-- make/photon/registry/Dockerfile | 4 +-- make/photon/registryctl/Dockerfile | 2 +- make/photon/ui/Dockerfile | 2 +- tests/resources/Harbor-Util.robot | 4 +-- 16 files changed, 63 insertions(+), 66 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3767aeb3d..877ad7fb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ before_script: - cd tests && sudo ./ldapprepare.sh && cd .. - sudo ./tests/admiral.sh - sudo make compile_adminserver - - sudo make -f make/photon/Makefile _build_adminiserver _build_db _build_registry -e VERSIONTAG=dev -e CLAIRDBVERSION=dev -e REGISTRYVERSION=${REG_VERSION} + - sudo make -f make/photon/Makefile _build_adminserver _build_db _build_registry -e VERSIONTAG=dev -e CLAIRDBVERSION=dev -e REGISTRYVERSION=${REG_VERSION} - 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 - sudo mkdir -p ./make/common/config/registry/ && sudo mv ./tests/reg_config.yml ./make/common/config/registry/config.yml diff --git a/Makefile b/Makefile index 5e92be48f..fef835923 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ # package_online: # prepare online install package # for example: make package_online -e DEVFLAG=false\ -# REGISTRYSERVER=reg-bj.eng.vmware.com \ +# REGISTRYSERVER=reg-bj.goharbor.io \ # REGISTRYPROJECTNAME=harborrelease # # package_offline: @@ -33,13 +33,13 @@ # pushimage: push Harbor images to specific registry server # for example: make pushimage -e DEVFLAG=false REGISTRYUSER=admin \ # REGISTRYPASSWORD=***** \ -# REGISTRYSERVER=reg-bj.eng.vmware.com/ \ +# REGISTRYSERVER=reg-bj.goharbor.io/ \ # REGISTRYPROJECTNAME=harborrelease # note**: need add "/" on end of REGISTRYSERVER. If not setting \ # this value will push images directly to dockerhub. -# make pushimage -e DEVFLAG=false REGISTRYUSER=vmware \ +# make pushimage -e DEVFLAG=false REGISTRYUSER=goharbor \ # REGISTRYPASSWORD=***** \ -# REGISTRYPROJECTNAME=vmware +# REGISTRYPROJECTNAME=goharbor # # clean: remove binary, Harbor images, specific version docker-compose \ # file, specific version tag and online/offline install package @@ -100,7 +100,6 @@ VERSIONFILENAME=UIVERSION REGISTRYVERSION=v2.6.2 NGINXVERSION=$(VERSIONTAG) NOTARYVERSION=v0.6.1 -MARIADBVERSION=$(VERSIONTAG) CLAIRVERSION=v2.0.5 CLAIRDBVERSION=$(VERSIONTAG) MIGRATORVERSION=$(VERSIONTAG) @@ -141,11 +140,10 @@ GOBUILDPATH_UI=$(GOBUILDPATH)/src/ui GOBUILDPATH_JOBSERVICE=$(GOBUILDPATH)/src/jobservice GOBUILDPATH_REGISTRYCTL=$(GOBUILDPATH)/src/registryctl GOBUILDMAKEPATH=$(GOBUILDPATH)/make -GOBUILDMAKEPATH_ADMINSERVER=$(GOBUILDMAKEPATH)/dev/adminserver -GOBUILDMAKEPATH_UI=$(GOBUILDMAKEPATH)/dev/ui -GOBUILDMAKEPATH_JOBSERVICE=$(GOBUILDMAKEPATH)/dev/jobservice -GOBUILDMAKEPATH_REGISTRYCTL=$(GOBUILDMAKEPATH)/dev/registryctl -GOLANGDOCKERFILENAME=Dockerfile.golang +GOBUILDMAKEPATH_ADMINSERVER=$(GOBUILDMAKEPATH)/photon/adminserver +GOBUILDMAKEPATH_UI=$(GOBUILDMAKEPATH)/photon/ui +GOBUILDMAKEPATH_JOBSERVICE=$(GOBUILDMAKEPATH)/photon/jobservice +GOBUILDMAKEPATH_REGISTRYCTL=$(GOBUILDMAKEPATH)/photon/registryctl # binary ADMINSERVERBINARYPATH=$(MAKEDEVPATH)/adminserver @@ -286,7 +284,7 @@ compile_adminserver: @echo "compiling binary for adminserver (golang image)..." @echo $(GOBASEPATH) @echo $(GOBUILDPATH) - @$(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATH) -w $(GOBUILDPATH_ADMINSERVER) $(GOBUILDIMAGE) $(GOIMAGEBUILD) -o $(GOBUILDMAKEPATH_ADMINSERVER)/$(ADMINSERVERBINARYNAME) + $(DOCKERCMD) run --rm -v $(BUILDPATH):$(GOBUILDPATH) -w $(GOBUILDPATH_ADMINSERVER) $(GOBUILDIMAGE) $(GOIMAGEBUILD) -o $(GOBUILDMAKEPATH_ADMINSERVER)/$(ADMINSERVERBINARYNAME) @echo "Done." compile_ui: @@ -313,7 +311,7 @@ prepare: @$(MAKEPATH)/$(PREPARECMD) $(PREPARECMD_PARA) build: - make -f $(MAKEFILEPATH_PHOTON)/Makefile build -e DEVFLAG=$(DEVFLAG) -e MARIADBVERSION=$(MARIADBVERSION) \ + make -f $(MAKEFILEPATH_PHOTON)/Makefile build -e DEVFLAG=$(DEVFLAG) \ -e REGISTRYVERSION=$(REGISTRYVERSION) -e NGINXVERSION=$(NGINXVERSION) -e NOTARYVERSION=$(NOTARYVERSION) \ -e CLAIRVERSION=$(CLAIRVERSION) -e CLAIRDBVERSION=$(CLAIRDBVERSION) -e VERSIONTAG=$(VERSIONTAG) \ -e BUILDBIN=$(BUILDBIN) -e REDISVERSION=$(REDISVERSION) -e MIGRATORVERSION=$(MIGRATORVERSION) \ @@ -332,7 +330,6 @@ modify_composefile_notary: @echo "preparing docker-compose notary file..." @cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYTPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) @$(SEDCMD) -i 's/__notary_version__/$(NOTARYVERSION)-$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) - @$(SEDCMD) -i 's/__mariadb_version__/$(MARIADBVERSION)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) modify_composefile_clair: @echo "preparing docker-compose clair file..." diff --git a/make/photon/Makefile b/make/photon/Makefile index 94ea817ee..ee9a83d49 100644 --- a/make/photon/Makefile +++ b/make/photon/Makefile @@ -98,27 +98,27 @@ CHART_SERVER_BIN_NAME=chartm _build_db: @echo "building db container for photon..." - @cd $(DOCKERFILEPATH_DB) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_DB)/$(DOCKERFILENAME_DB) -t $(DOCKERIMAGENAME_DB):$(VERSIONTAG) . + @$(DOCKERBUILD) -f $(DOCKERFILEPATH_DB)/$(DOCKERFILENAME_DB) -t $(DOCKERIMAGENAME_DB):$(VERSIONTAG) . @echo "Done." -_build_adminiserver: +_build_adminserver: @echo "building adminserver container for photon..." - $(DOCKERBUILD) -f $(DOCKERFILEPATH_ADMINSERVER)/$(DOCKERFILENAME_ADMINSERVER) -t $(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) . + @$(DOCKERBUILD) -f $(DOCKERFILEPATH_ADMINSERVER)/$(DOCKERFILENAME_ADMINSERVER) -t $(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) . @echo "Done." _build_ui: @echo "building ui container for photon..." - $(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) . + @$(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) . @echo "Done." _build_jobservice: @echo "building jobservice container for photon..." - $(DOCKERBUILD) -f $(DOCKERFILEPATH_JOBSERVICE)/$(DOCKERFILENAME_JOBSERVICE) -t $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) . + @$(DOCKERBUILD) -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) $(DOCKERFILEPATH_LOG) + $(DOCKERBUILD) -f $(DOCKERFILEPATH_LOG)/$(DOCKERFILENAME_LOG) -t $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) . @echo "Done." _build_clair: @@ -127,10 +127,10 @@ _build_clair: rm -rf $(DOCKERFILEPATH_CLAIR)/binary && mkdir -p $(DOCKERFILEPATH_CLAIR)/binary && \ $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair/release2.0-$(CLAIRVERSION)/clair, $(DOCKERFILEPATH_CLAIR)/binary/clair); \ else \ - cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION); \ + cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION) && cd - ; \ fi ; \ echo "building clair container for photon..." ; \ - cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_CLAIR)/$(DOCKERFILENAME_CLAIR) -t $(DOCKERIMAGENAME_CLAIR):$(CLAIRVERSION)-$(VERSIONTAG) . ; \ + $(DOCKERBUILD) -f $(DOCKERFILEPATH_CLAIR)/$(DOCKERFILENAME_CLAIR) -t $(DOCKERIMAGENAME_CLAIR):$(CLAIRVERSION)-$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_CLAIR)/binary; \ echo "Done." ; \ fi @@ -141,10 +141,10 @@ _build_chart_server: rm -rf $(DOCKERFILEPATH_CHART_SERVER)/binary && mkdir -p $(DOCKERFILEPATH_CHART_SERVER)/binary && \ $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/chartm, $(DOCKERFILEPATH_CHART_SERVER)/binary/chartm); \ else \ - cd $(DOCKERFILEPATH_CHART_SERVER) && $(DOCKERFILEPATH_CHART_SERVER)/builder $(GOBUILDIMAGE) $(CHART_SERVER_CODE_BASE) $(CHARTMUSEUMVERSION) $(CHART_SERVER_MAIN_PATH) $(CHART_SERVER_BIN_NAME); \ + 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..." ; \ - cd $(DOCKERFILEPATH_CHART_SERVER) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_CHART_SERVER)/$(DOCKERFILENAME_CHART_SERVER) -t $(DOCKERIMAGENAME_CHART_SERVER):$(CHARTMUSEUMVERSION)-$(VERSIONTAG) . ; \ + $(DOCKERBUILD) -f $(DOCKERFILEPATH_CHART_SERVER)/$(DOCKERFILENAME_CHART_SERVER) -t $(DOCKERIMAGENAME_CHART_SERVER):$(CHARTMUSEUMVERSION)-$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_CHART_SERVER)/binary; \ echo "Done." ; \ fi @@ -159,15 +159,15 @@ _build_notary: if [ "$(BUILDBIN)" != "true" ] ; then \ rm -rf $(DOCKERFILEPATH_NOTARY)/binary && mkdir -p $(DOCKERFILEPATH_NOTARY)/binary && \ $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-signer, $(DOCKERFILEPATH_NOTARY)/binary/notary-signer) && \ - $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-server, $(DOCKERFILEPATH_NOTARY)/binary/notary-server) && \ - $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-migrate-postgresql.tgz, $(DOCKERFILEPATH_NOTARY)/binary/notary-migrate.tgz); \ - cd $(DOCKERFILEPATH_NOTARY)/binary && tar -zvxf notary-migrate.tgz; \ + $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-server, $(DOCKERFILEPATH_NOTARY)/binary/notary-server) ; \ else \ - cd $(DOCKERFILEPATH_NOTARY) && $(DOCKERFILEPATH_NOTARY)/builder_public $(NOTARYVERSION); \ + cd $(DOCKERFILEPATH_NOTARY) && $(DOCKERFILEPATH_NOTARY)/builder $(NOTARYVERSION) && cd - ; \ fi ; \ + $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-migrate-postgresql.tgz, $(DOCKERFILEPATH_NOTARY)/binary/notary-migrate.tgz); \ + cd $(DOCKERFILEPATH_NOTARY)/binary && tar -zvxf notary-migrate.tgz && cd - ; \ echo "building notary container for photon..."; \ - cd $(DOCKERFILEPATH_NOTARY) && chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-signer && $(DOCKERBUILD) -f $(DOCKERFILEPATH_NOTARY)/$(DOCKERFILENAME_NOTARYSIGNER) -t $(DOCKERIMAGENAME_NOTARYSIGNER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \ - cd $(DOCKERFILEPATH_NOTARY) && chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-server && $(DOCKERBUILD) -f $(DOCKERFILEPATH_NOTARY)/$(DOCKERFILENAME_NOTARYSERVER) -t $(DOCKERIMAGENAME_NOTARYSERVER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \ + chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-signer && $(DOCKERBUILD) -f $(DOCKERFILEPATH_NOTARY)/$(DOCKERFILENAME_NOTARYSIGNER) -t $(DOCKERIMAGENAME_NOTARYSIGNER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \ + chmod 655 $(DOCKERFILEPATH_NOTARY)/binary/notary-server && $(DOCKERBUILD) -f $(DOCKERFILEPATH_NOTARY)/$(DOCKERFILENAME_NOTARYSERVER) -t $(DOCKERIMAGENAME_NOTARYSERVER):$(NOTARYVERSION)-$(VERSIONTAG) . ; \ rm -rf $(DOCKERFILEPATH_NOTARY)/binary; \ echo "Done."; \ fi @@ -177,21 +177,21 @@ _build_registry: rm -rf $(DOCKERFILEPATH_REG)/binary && mkdir -p $(DOCKERFILEPATH_REG)/binary && \ $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/registry, $(DOCKERFILEPATH_REG)/binary/registry); \ else \ - cd $(DOCKERFILEPATH_REG) && $(DOCKERFILEPATH_REG)/builder $(REGISTRYVERSION); \ + cd $(DOCKERFILEPATH_REG) && $(DOCKERFILEPATH_REG)/builder $(REGISTRYVERSION) && cd - ; \ fi @echo "building registry container for photon..." - @cd $(DOCKERFILEPATH_REG) && chmod 655 $(DOCKERFILEPATH_REG)/binary/registry && $(DOCKERBUILD) -f $(DOCKERFILEPATH_REG)/$(DOCKERFILENAME_REG) -t $(DOCKERIMAGENAME_REG):$(REGISTRYVERSION)-$(VERSIONTAG) . + @chmod 655 $(DOCKERFILEPATH_REG)/binary/registry && $(DOCKERBUILD) -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) -f $(DOCKERFILEPATH_REGISTRYCTL)/$(DOCKERFILENAME_REGISTRYCTL) -t $(DOCKERIMAGENAME_REGISTRYCTL):$(VERSIONTAG) . @rm -rf $(DOCKERFILEPATH_REG)/binary @echo "Done." _build_redis: @echo "building redis container for photon..." - @cd $(DOCKERFILEPATH_REDIS) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_REDIS)/$(DOCKERFILENAME_REDIS) -t $(DOCKERIMAGENAME_REDIS):$(REDISVERSION) . + @$(DOCKERBUILD) -f $(DOCKERFILEPATH_REDIS)/$(DOCKERFILENAME_REDIS) -t $(DOCKERIMAGENAME_REDIS):$(REDISVERSION) . @echo "Done." _build_migrator: @@ -203,7 +203,7 @@ define _get_binary $(WGET) --timeout 30 --no-check-certificate $1 -O $2 endef -build: _build_db _build_adminiserver _build_ui _build_jobservice _build_log _build_nginx _build_registry _build_registryctl _build_notary _build_clair _build_redis _build_migrator _build_chart_server +build: _build_db _build_adminserver _build_ui _build_jobservice _build_log _build_nginx _build_registry _build_registryctl _build_notary _build_clair _build_redis _build_chart_server cleanimage: @echo "cleaning image for photon..." diff --git a/make/photon/adminserver/Dockerfile b/make/photon/adminserver/Dockerfile index f6bd90839..b090c0059 100644 --- a/make/photon/adminserver/Dockerfile +++ b/make/photon/adminserver/Dockerfile @@ -6,7 +6,7 @@ RUN tdnf erase vim -y \ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \ && mkdir /harbor/ -COPY ./make/dev/adminserver/harbor_adminserver ./make/photon/adminserver/start.sh /harbor/ +COPY ./make/photon/adminserver/harbor_adminserver ./make/photon/adminserver/start.sh /harbor/ #As UI will be blocked until adminserver is ready, let adminserver do the initialise work for DB COPY ./make/migrations /harbor/migrations diff --git a/make/photon/chartserver/Dockerfile b/make/photon/chartserver/Dockerfile index 5522422e2..2f423715a 100644 --- a/make/photon/chartserver/Dockerfile +++ b/make/photon/chartserver/Dockerfile @@ -7,8 +7,8 @@ RUN tdnf distro-sync -y \ && mkdir /chartserver/ \ && groupadd -r -g 10000 chartuser \ && useradd --no-log-init -m -r -g 10000 -u 10000 chartuser -COPY ./binary/chartm /chartserver/ -COPY docker-entrypoint.sh /docker-entrypoint.sh +COPY ./make/photon/chartserver/binary/chartm /chartserver/ +COPY ./make/photon/chartserver/docker-entrypoint.sh /docker-entrypoint.sh VOLUME ["/chart_storage"] EXPOSE 9999 diff --git a/make/photon/clair/Dockerfile b/make/photon/clair/Dockerfile index 94f33a096..3cec1dc76 100644 --- a/make/photon/clair/Dockerfile +++ b/make/photon/clair/Dockerfile @@ -8,9 +8,9 @@ RUN tdnf distro-sync -y \ && mkdir /clair/ \ && groupadd -r -g 10000 clair \ && useradd --no-log-init -m -r -g 10000 -u 10000 clair -COPY ./binary/clair /clair/ -COPY docker-entrypoint.sh /docker-entrypoint.sh -COPY dumb-init /dumb-init +COPY ./make/photon/clair/binary/clair /clair/ +COPY ./make/photon/clair/docker-entrypoint.sh /docker-entrypoint.sh +COPY ./make/photon/clair/dumb-init /dumb-init VOLUME /config diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile index 7eef0eb62..8c91a9fd3 100644 --- a/make/photon/db/Dockerfile +++ b/make/photon/db/Dockerfile @@ -20,15 +20,15 @@ RUN touch /etc/localtime.bak \ VOLUME /var/lib/postgresql/data -ADD docker-entrypoint.sh /entrypoint.sh -ADD docker-healthcheck.sh /docker-healthcheck.sh +ADD ./make/photon/db/docker-entrypoint.sh /entrypoint.sh +ADD ./make/photon/db/docker-healthcheck.sh /docker-healthcheck.sh RUN chmod u+x /entrypoint.sh /docker-healthcheck.sh ENTRYPOINT ["/entrypoint.sh"] HEALTHCHECK CMD ["/docker-healthcheck.sh"] -COPY initial-notaryserver.sql /docker-entrypoint-initdb.d/ -COPY initial-notarysigner.sql /docker-entrypoint-initdb.d/ -COPY initial-registry.sql /docker-entrypoint-initdb.d/ +COPY ./make/photon/db/initial-notaryserver.sql /docker-entrypoint-initdb.d/ +COPY ./make/photon/db/initial-notarysigner.sql /docker-entrypoint-initdb.d/ +COPY ./make/photon/db/initial-registry.sql /docker-entrypoint-initdb.d/ EXPOSE 5432 CMD ["postgres"] diff --git a/make/photon/jobservice/Dockerfile b/make/photon/jobservice/Dockerfile index 77250d9c4..ebb46fe13 100644 --- a/make/photon/jobservice/Dockerfile +++ b/make/photon/jobservice/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir /harbor/ \ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor -COPY ./make/photon/jobservice/start.sh ./make/dev/jobservice/harbor_jobservice /harbor/ +COPY ./make/photon/jobservice/start.sh ./make/photon/jobservice/harbor_jobservice /harbor/ RUN chmod u+x /harbor/harbor_jobservice /harbor/start.sh WORKDIR /harbor/ diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile index a42c0f94f..393a113d0 100644 --- a/make/photon/log/Dockerfile +++ b/make/photon/log/Dockerfile @@ -7,15 +7,15 @@ RUN tdnf distro-sync -y \ && groupadd -r -g 10000 syslog && useradd --no-log-init -r -g 10000 -u 10000 syslog \ && tdnf clean all -COPY rsyslog.conf /etc/rsyslog.conf +COPY ./make/photon/log/rsyslog.conf /etc/rsyslog.conf # rsyslog configuration file for docker -COPY rsyslog_docker.conf /etc/rsyslog.d/ +COPY ./make/photon/log/rsyslog_docker.conf /etc/rsyslog.d/ # run logrotate hourly RUN mv /etc/cron.daily/logrotate /etc/cron.hourly/logrotate -COPY start.sh /usr/local/bin/ +COPY ./make/photon/log/start.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/start.sh && \ chown -R 10000:10000 /etc/rsyslog.conf /etc/rsyslog.d/ /run diff --git a/make/photon/notary/server.Dockerfile b/make/photon/notary/server.Dockerfile index 320b36d9e..1420690a4 100644 --- a/make/photon/notary/server.Dockerfile +++ b/make/photon/notary/server.Dockerfile @@ -7,10 +7,10 @@ RUN tdnf distro-sync -y \ && groupadd -r -g 10000 notary \ && useradd --no-log-init -r -g 10000 -u 10000 notary -COPY ./binary/notary-server /bin/notary-server -COPY ./binary/migrate /bin/migrate -COPY ./binary/migrations/ /migrations/ -COPY ./server-start.sh /bin/server-start.sh +COPY ./make/photon/notary/binary/notary-server /bin/notary-server +COPY ./make/photon/notary/binary/migrate /bin/migrate +COPY ./make/photon/notary/binary/migrations/ /migrations/ +COPY ./make/photon/notary/server-start.sh /bin/server-start.sh RUN chmod u+x /bin/notary-server /migrations/migrate.sh /bin/migrate /bin/server-start.sh ENV SERVICE_NAME=notary_server ENTRYPOINT [ "/bin/server-start.sh" ] diff --git a/make/photon/notary/signer.Dockerfile b/make/photon/notary/signer.Dockerfile index 09af08bba..aa46ce112 100644 --- a/make/photon/notary/signer.Dockerfile +++ b/make/photon/notary/signer.Dockerfile @@ -6,10 +6,10 @@ RUN tdnf distro-sync -y \ && tdnf clean all \ && groupadd -r -g 10000 notary \ && useradd --no-log-init -r -g 10000 -u 10000 notary -COPY ./binary/notary-signer /bin/notary-signer -COPY ./binary/migrate /bin/migrate -COPY ./binary/migrations/ /migrations/ -COPY ./signer-start.sh /bin/signer-start.sh +COPY ./make/photon/notary/binary/notary-signer /bin/notary-signer +COPY ./make/photon/notary/binary/migrate /bin/migrate +COPY ./make/photon/notary/binary/migrations/ /migrations/ +COPY ./make/photon/notary/signer-start.sh /bin/signer-start.sh RUN chmod u+x /bin/notary-signer /migrations/migrate.sh /bin/migrate /bin/signer-start.sh ENV SERVICE_NAME=notary_signer diff --git a/make/photon/redis/Dockerfile b/make/photon/redis/Dockerfile index 1276a5c47..6f27ee356 100644 --- a/make/photon/redis/Dockerfile +++ b/make/photon/redis/Dockerfile @@ -5,8 +5,8 @@ RUN tdnf distro-sync -y \ VOLUME /var/lib/redis WORKDIR /var/lib/redis -COPY docker-entrypoint.sh /usr/bin/ -COPY redis.conf /etc/redis.conf +COPY ./make/photon/redis/docker-entrypoint.sh /usr/bin/ +COPY ./make/photon/redis/redis.conf /etc/redis.conf RUN chmod +x /usr/bin/docker-entrypoint.sh \ && chown redis:redis /etc/redis.conf ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/make/photon/registry/Dockerfile b/make/photon/registry/Dockerfile index 102407b00..a26ccb032 100644 --- a/make/photon/registry/Dockerfile +++ b/make/photon/registry/Dockerfile @@ -9,12 +9,12 @@ RUN tdnf distro-sync -y \ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor -COPY entrypoint.sh / +COPY ./make/photon/registry/entrypoint.sh / RUN chmod u+x /entrypoint.sh RUN mkdir -p /etc/registry -COPY binary/registry /usr/bin +COPY ./make/photon/registry/binary/registry /usr/bin RUN chmod u+x /usr/bin/registry HEALTHCHECK CMD curl 127.0.0.1:5000/ diff --git a/make/photon/registryctl/Dockerfile b/make/photon/registryctl/Dockerfile index 9e6e7e2a9..ba3bbc65e 100644 --- a/make/photon/registryctl/Dockerfile +++ b/make/photon/registryctl/Dockerfile @@ -11,7 +11,7 @@ RUN tdnf distro-sync -y \ COPY ./make/photon/registry/binary/registry /usr/bin COPY ./make/photon/registryctl/start.sh /harbor/ -COPY ./make/dev/registryctl/harbor_registryctl /harbor/ +COPY ./make/photon/registryctl/harbor_registryctl /harbor/ RUN chmod u+x /harbor/harbor_registryctl \ && chmod u+x /usr/bin/registry \ diff --git a/make/photon/ui/Dockerfile b/make/photon/ui/Dockerfile index 887d64124..fcf8f15d5 100644 --- a/make/photon/ui/Dockerfile +++ b/make/photon/ui/Dockerfile @@ -8,7 +8,7 @@ RUN tdnf distro-sync -y \ && mkdir /harbor/ HEALTHCHECK CMD curl --fail -s http://127.0.0.1:8080/api/ping || exit 1 -COPY ./make/dev/ui/harbor_ui ./src/favicon.ico ./make/photon/ui/start.sh ./UIVERSION /harbor/ +COPY ./make/photon/ui/harbor_ui ./src/favicon.ico ./make/photon/ui/start.sh ./UIVERSION /harbor/ COPY ./src/ui/views /harbor/views COPY ./src/ui/static /harbor/static diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index 3abe3284e..a5bec12e2 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}=goharbor/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}=false ${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}=goharbor/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}=false ${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=