From eb8b0b19bfbbc4346da28dddb37b4486246b83ce Mon Sep 17 00:00:00 2001 From: Wang Yan Date: Thu, 4 Mar 2021 19:19:21 +0800 Subject: [PATCH] patch upstream fix for io reader (#14363) Fixes #12850 This patch can fix the GC failure in the NFS v3 env, see https://github.com/distribution/distribution/pull/3309#issuecomment-783606968 Signed-off-by: Wang Yan --- make/photon/registry/builder | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/make/photon/registry/builder b/make/photon/registry/builder index 8e7c603c129..7c7ca3cdd29 100755 --- a/make/photon/registry/builder +++ b/make/photon/registry/builder @@ -20,13 +20,21 @@ cur=$PWD # the temp folder to store distribution source code... TEMP=`mktemp -d ${TMPDIR-/tmp}/distribution.XXXXXX` -git clone -b $VERSION https://github.com/docker/distribution.git $TEMP +git clone -b $VERSION https://github.com/distribution/distribution.git $TEMP # add patch 2879 -echo 'add patch https://github.com/docker/distribution/pull/2879 ...' +echo 'add patch https://github.com/distribution/distribution/pull/2879 ...' cd $TEMP -wget https://github.com/docker/distribution/pull/2879.patch +wget https://github.com/distribution/distribution/pull/2879.patch git apply 2879.patch + +# add patch 3370 +echo 'add patch https://github.com/distribution/distribution/pull/3370 ...' +cd $TEMP +wget https://github.com/distribution/distribution/pull/3370.patch +git apply 3370.patch + +# add patch redis git apply $cur/redis.patch cd $cur