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

Switch from "openssl" to "libressl" for Alpine 3.6+

This commit is contained in:
Tianon Gravi 2017-08-08 09:33:44 -07:00
parent e219bf6f6a
commit ecbfdeb2b7
6 changed files with 26 additions and 22 deletions

View file

@ -30,20 +30,20 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
openssl \
openssl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \
tar \
xz \
yaml-dev \
zlib-dev \
xz \
\
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
@ -86,8 +86,8 @@ RUN set -ex \
ca-certificates \
libffi-dev \
openssl-dev \
yaml-dev \
procps \
yaml-dev \
zlib-dev \
&& apk del .ruby-builddeps \
&& cd / \

View file

@ -30,20 +30,20 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
openssl \
openssl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \
tar \
xz \
yaml-dev \
zlib-dev \
xz \
\
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
@ -86,8 +86,8 @@ RUN set -ex \
ca-certificates \
libffi-dev \
openssl-dev \
yaml-dev \
procps \
yaml-dev \
zlib-dev \
&& apk del .ruby-builddeps \
&& cd / \

View file

@ -30,20 +30,20 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
openssl \
openssl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \
tar \
xz \
yaml-dev \
zlib-dev \
xz \
\
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
@ -86,8 +86,8 @@ RUN set -ex \
ca-certificates \
libffi-dev \
openssl-dev \
yaml-dev \
procps \
yaml-dev \
zlib-dev \
&& apk del .ruby-builddeps \
&& cd / \

View file

@ -30,20 +30,20 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \
tar \
xz \
yaml-dev \
zlib-dev \
xz \
\
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
@ -85,9 +85,9 @@ RUN set -ex \
bzip2 \
ca-certificates \
libffi-dev \
openssl-dev \
yaml-dev \
libressl-dev \
procps \
yaml-dev \
zlib-dev \
&& apk del .ruby-builddeps \
&& cd / \

View file

@ -30,20 +30,20 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \
tar \
xz \
yaml-dev \
zlib-dev \
xz \
\
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
@ -85,9 +85,9 @@ RUN set -ex \
bzip2 \
ca-certificates \
libffi-dev \
openssl-dev \
yaml-dev \
libressl-dev \
procps \
yaml-dev \
zlib-dev \
&& apk del .ruby-builddeps \
&& cd / \

View file

@ -75,6 +75,10 @@ for version in "${versions[@]}"; do
-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
"$template" > "$dir/Dockerfile"
if [ "$variant" = 'alpine3.4' ]; then
sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile"
fi
case "$v" in
*/onbuild) ;;
*)