1
0
Fork 0
mirror of https://github.com/docker-library/ruby.git synced 2022-11-09 11:41:34 -05:00

Remove sha256sum from GitHub patch file

We pull it via https, and thus can generally trust that we get the right thing -- we've had *many* instances of the sha256sum flopping back and forth based on minor adjustments to the generated patch format GitHub generates.
This commit is contained in:
yosifkit 2021-08-23 09:10:27 -07:00 committed by Tianon Gravi
parent 301b52c1bb
commit 659f4ab3a2
2 changed files with 0 additions and 3 deletions

View file

@ -86,7 +86,6 @@ RUN set -eux; \
# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) # https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
# https://github.com/ruby/ruby/pull/3773 # https://github.com/ruby/ruby/pull/3773
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
echo '95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64 *autoconf-2.70.patch' | sha256sum --check --strict; \
patch -p1 -i autoconf-2.70.patch; \ patch -p1 -i autoconf-2.70.patch; \
rm autoconf-2.70.patch; \ rm autoconf-2.70.patch; \
\ \

View file

@ -140,14 +140,12 @@ RUN set -eux; \
"2.6": { "2.6": {
url: "https://github.com/ruby/ruby/pull/3773", url: "https://github.com/ruby/ruby/pull/3773",
commit: "fcc88da5eb162043adcba552646677d2ab5adf55", commit: "fcc88da5eb162043adcba552646677d2ab5adf55",
sha256: "95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64",
}, },
}[env.version] | if . and env.variant != "alpine3.13" then ( }[env.version] | if . and env.variant != "alpine3.13" then (
-}} -}}
# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) # https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
# {{ .url }} # {{ .url }}
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \ wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \
echo '{{ .sha256 }} *autoconf-2.70.patch' | sha256sum --check --strict; \
patch -p1 -i autoconf-2.70.patch; \ patch -p1 -i autoconf-2.70.patch; \
rm autoconf-2.70.patch; \ rm autoconf-2.70.patch; \
\ \