Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cherry-pick]patch upstream fix for io reader #14363

Merged
merged 1 commit into from
Mar 4, 2021
Merged

[cherry-pick]patch upstream fix for io reader #14363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions make/photon/registry/builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down