diff --git a/Makefile b/Makefile index 591851ca501..3e1012a6e55 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ DOCKERSAVE_PARA=$(DOCKERIMAGENAME_ADMINSERVER):$(VERSIONTAG) \ $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ vmware/redis-photon:$(REDISVERSION) \ vmware/nginx-photon:$(NGINXVERSION) vmware/registry-photon:$(REGISTRYVERSION)-$(VERSIONTAG) \ - vmware/photon:$(PHOTONVERSION) + photon:$(PHOTONVERSION) PACKAGE_OFFLINE_PARA=-zcvf harbor-offline-installer-$(PKGVERSIONTAG).tgz \ $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \ $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \ diff --git a/make/photon/adminserver/Dockerfile b/make/photon/adminserver/Dockerfile index 82b638d12f2..b2eba4f2638 100644 --- a/make/photon/adminserver/Dockerfile +++ b/make/photon/adminserver/Dockerfile @@ -1,7 +1,7 @@ FROM photon:1.0 RUN tdnf erase vim -y \ - && tdnf distro-sync -y || echo \ + && tdnf distro-sync -y \ && tdnf install -y sudo >> /dev/null \ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor \ diff --git a/make/photon/jobservice/Dockerfile b/make/photon/jobservice/Dockerfile index 50b0cbf2af3..77250d9c474 100644 --- a/make/photon/jobservice/Dockerfile +++ b/make/photon/jobservice/Dockerfile @@ -1,7 +1,7 @@ FROM photon:1.0 RUN mkdir /harbor/ \ - && tdnf distro-sync -y || echo \ + && tdnf distro-sync -y \ && tdnf install sudo -y >> /dev/null\ && tdnf clean all \ && groupadd -r -g 10000 harbor && useradd --no-log-init -r -g 10000 -u 10000 harbor