diff --git a/Makefile b/Makefile index c5a46a9fe..e02021485 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ REGISTRYSERVER= REGISTRYPROJECTNAME=vmware DEVFLAG=true NOTARYFLAG=false -REGISTRYVERSION=2.6.1-photon +REGISTRYVERSION=2.6.2-photon NGINXVERSION=1.11.13 PHOTONVERSION=1.0 NOTARYVERSION=server-0.5.0 diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl index e22a5793d..2878d2b9f 100644 --- a/make/docker-compose.tpl +++ b/make/docker-compose.tpl @@ -11,7 +11,7 @@ services: networks: - harbor registry: - image: vmware/registry:2.6.1-photon + image: vmware/registry:2.6.2-photon container_name: registry restart: always volumes: diff --git a/make/photon/registry/Dockerfile b/make/photon/registry/Dockerfile new file mode 100644 index 000000000..a4100c4d1 --- /dev/null +++ b/make/photon/registry/Dockerfile @@ -0,0 +1,15 @@ +FROM library/photon:1.0 + +MAINTAINER wangyan@vmware.com + +# The original script in the docker offical registry image. +COPY entrypoint.sh / +RUN chmod u+x /entrypoint.sh + +COPY registry /usr/bin +RUN chmod u+x /usr/bin/registry + +VOLUME ["/var/lib/registry"] +EXPOSE 5000 +ENTRYPOINT ["/entrypoint.sh"] +CMD ["/etc/docker/registry/config.yml"]