diff --git a/Makefile b/Makefile index 79e5584aa..592a179d2 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ VERSIONFILENAME=UIVERSION PREPARE_VERSION_NAME=versions #versions -REGISTRYVERSION=v2.7.1-patch-2819 +REGISTRYVERSION=v2.7.1-patch-2819-2553 NGINXVERSION=$(VERSIONTAG) NOTARYVERSION=v0.6.1 CLAIRVERSION=v2.0.9 diff --git a/make/photon/registry/builder b/make/photon/registry/builder index 67ea71ede..48ec5b3dd 100755 --- a/make/photon/registry/builder +++ b/make/photon/registry/builder @@ -22,6 +22,13 @@ cur=$PWD TEMP=`mktemp -d /$TMPDIR/distribution.XXXXXX` git clone -b $VERSION https://github.com/docker/distribution.git $TEMP +# add patch 2879 +echo 'add patch https://github.com/docker/distribution/pull/2879 ...' +cd $TEMP +wget https://github.com/docker/distribution/pull/2879.patch +git apply 2879.patch +cd $cur + echo 'build the registry binary bases on the golang:1.11...' cp Dockerfile.binary $TEMP docker build -f $TEMP/Dockerfile.binary -t registry-golang $TEMP