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

Add libssl1.0-dev mangling to the auto update script and run update.sh

Browse source
This commit is contained in:
Felipe Sateler 2018-01-04 10:54:34 -03:00 committed by Joe Ferguson
parent 0008d79b12
commit 4d2e178d38
4 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
2.3/stretch/Dockerfile
View file

@ -8,10 +8,10 @@ RUN mkdir -p /usr/local/etc \
} >> /usr/local/etc/gemrc
ENV RUBY_MAJOR 2.3
ENV RUBY_VERSION 2.3.5
ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda
ENV RUBYGEMS_VERSION 2.6.14
ENV BUNDLER_VERSION 1.15.4
ENV RUBY_VERSION 2.3.6
ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.16.1
# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
@ -21,8 +21,9 @@ RUN set -ex \
bison \
dpkg-dev \
libgdbm-dev \
ruby \
# ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x)
libssl1.0-dev \
ruby \
' \
&& apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps \
@ -60,7 +61,8 @@ RUN set -ex \
&& rm -r /usr/src/ruby \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& rm -r /root/.gem/
# install things globally, for great justice
# and don't create ".bundle" in all our apps

11
2.3/stretch/slim/Dockerfile
View file

@ -20,10 +20,10 @@ RUN mkdir -p /usr/local/etc \
} >> /usr/local/etc/gemrc
ENV RUBY_MAJOR 2.3
ENV RUBY_VERSION 2.3.5
ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda
ENV RUBYGEMS_VERSION 2.6.14
ENV BUNDLER_VERSION 1.15.4
ENV RUBY_VERSION 2.3.6
ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.16.1
# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
@ -85,7 +85,8 @@ RUN set -ex \
&& rm -r /usr/src/ruby \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& rm -r /root/.gem/
# install things globally, for great justice
# and don't create ".bundle" in all our apps

2
Dockerfile-debian.template
View file

@ -21,6 +21,8 @@ RUN set -ex \
bison \
dpkg-dev \
libgdbm-dev \
# ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x)
libssl1.0-dev \
ruby \
' \
&& apt-get update \

7
update.sh
View file

@ -87,6 +87,13 @@ for version in "${versions[@]}"; do
-e 's!%%SHA256%%!'"$shaVal"'!g' \
-e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \
-e 's!%%BUNDLER%%!'"$bundler"'!g' \
-e "$(
if [ "$version" = 2.3 ] && [[ "$v" = stretch* ]]; then
echo 's/libssl-dev/libssl1.0-dev/g'
else
echo '/libssl1.0-dev/d'
fi
)" \
-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
"$template" > "$dir/Dockerfile"