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

Simplify update.sh handling of rubygems now that 2.5 is our only remaining instance

This commit is contained in:
Tianon Gravi 2020-09-28 13:56:39 -07:00
parent 0555f85862
commit 4deeb55ed0

View file

@ -13,19 +13,6 @@ releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')"
newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml)
# TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well # TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well
latest_gem_version() {
curl -fsSL "https://rubygems.org/api/v1/gems/$1.json" | sed -r 's/^.*"version":"([^"]+)".*$/\1/'
}
# https://github.com/docker-library/ruby/issues/246
rubygems='3.0.3'
declare -A newEnoughRubygems=(
[2.6]=1 # 2.6.3 => gems 3.0.3 (https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems.rb#L12)
[2.7]=1 # 2.7.0-preview2 => gems 3.1.0.pre1 (https://github.com/ruby/ruby/blob/v2_7_0_preview1/lib/rubygems.rb#L12)
[3.0]=1 # 3.0.0-preview1 => gems 3.2.0.rc.1 (https://github.com/ruby/ruby/blob/v3_0_0_preview1/lib/rubygems.rb#L11)
)
# TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely
for version in "${versions[@]}"; do for version in "${versions[@]}"; do
rcGrepV='-v' rcGrepV='-v'
rcVersion="${version%-rc}" rcVersion="${version%-rc}"
@ -94,7 +81,6 @@ for version in "${versions[@]}"; do
-e 's!%%VERSION%%!'"$version"'!g' \ -e 's!%%VERSION%%!'"$version"'!g' \
-e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \
-e 's!%%SHA256%%!'"$shaVal"'!g' \ -e 's!%%SHA256%%!'"$shaVal"'!g' \
-e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \
-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
"$template" > "$dir/Dockerfile" "$template" > "$dir/Dockerfile"
@ -105,7 +91,13 @@ for version in "${versions[@]}"; do
;; ;;
esac esac
if [ -n "${newEnoughRubygems[$rcVersion]:-}" ]; then # https://github.com/docker-library/ruby/issues/246
if [ "$rcVersion" = '2.5' ]; then
rubygems='3.0.3'
sed -ri \
-e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \
"$dir/Dockerfile"
else
sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile"
fi fi
done done