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
parent
e219bf6f6a
commit
ecbfdeb2b7
6 changed files with 26 additions and 22 deletions
|
|
@ -30,20 +30,20 @@ RUN set -ex \
|
||||||
glib-dev \
|
glib-dev \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
|
openssl \
|
||||||
|
openssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt-dev \
|
libxslt-dev \
|
||||||
linux-headers \
|
linux-headers \
|
||||||
make \
|
make \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
openssl \
|
|
||||||
openssl-dev \
|
|
||||||
procps \
|
procps \
|
||||||
readline-dev \
|
readline-dev \
|
||||||
ruby \
|
ruby \
|
||||||
tar \
|
tar \
|
||||||
|
xz \
|
||||||
yaml-dev \
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
xz \
|
|
||||||
\
|
\
|
||||||
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.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 - \
|
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
|
||||||
|
|
@ -86,8 +86,8 @@ RUN set -ex \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
yaml-dev \
|
|
||||||
procps \
|
procps \
|
||||||
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
&& apk del .ruby-builddeps \
|
&& apk del .ruby-builddeps \
|
||||||
&& cd / \
|
&& cd / \
|
||||||
|
|
|
||||||
|
|
@ -30,20 +30,20 @@ RUN set -ex \
|
||||||
glib-dev \
|
glib-dev \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
|
openssl \
|
||||||
|
openssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt-dev \
|
libxslt-dev \
|
||||||
linux-headers \
|
linux-headers \
|
||||||
make \
|
make \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
openssl \
|
|
||||||
openssl-dev \
|
|
||||||
procps \
|
procps \
|
||||||
readline-dev \
|
readline-dev \
|
||||||
ruby \
|
ruby \
|
||||||
tar \
|
tar \
|
||||||
|
xz \
|
||||||
yaml-dev \
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
xz \
|
|
||||||
\
|
\
|
||||||
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.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 - \
|
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
|
||||||
|
|
@ -86,8 +86,8 @@ RUN set -ex \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
yaml-dev \
|
|
||||||
procps \
|
procps \
|
||||||
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
&& apk del .ruby-builddeps \
|
&& apk del .ruby-builddeps \
|
||||||
&& cd / \
|
&& cd / \
|
||||||
|
|
|
||||||
|
|
@ -30,20 +30,20 @@ RUN set -ex \
|
||||||
glib-dev \
|
glib-dev \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
|
openssl \
|
||||||
|
openssl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt-dev \
|
libxslt-dev \
|
||||||
linux-headers \
|
linux-headers \
|
||||||
make \
|
make \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
openssl \
|
|
||||||
openssl-dev \
|
|
||||||
procps \
|
procps \
|
||||||
readline-dev \
|
readline-dev \
|
||||||
ruby \
|
ruby \
|
||||||
tar \
|
tar \
|
||||||
|
xz \
|
||||||
yaml-dev \
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
xz \
|
|
||||||
\
|
\
|
||||||
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.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 - \
|
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
|
||||||
|
|
@ -86,8 +86,8 @@ RUN set -ex \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
openssl-dev \
|
openssl-dev \
|
||||||
yaml-dev \
|
|
||||||
procps \
|
procps \
|
||||||
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
&& apk del .ruby-builddeps \
|
&& apk del .ruby-builddeps \
|
||||||
&& cd / \
|
&& cd / \
|
||||||
|
|
|
||||||
|
|
@ -30,20 +30,20 @@ RUN set -ex \
|
||||||
glib-dev \
|
glib-dev \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
|
libressl \
|
||||||
|
libressl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt-dev \
|
libxslt-dev \
|
||||||
linux-headers \
|
linux-headers \
|
||||||
make \
|
make \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
openssl \
|
|
||||||
openssl-dev \
|
|
||||||
procps \
|
procps \
|
||||||
readline-dev \
|
readline-dev \
|
||||||
ruby \
|
ruby \
|
||||||
tar \
|
tar \
|
||||||
|
xz \
|
||||||
yaml-dev \
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
xz \
|
|
||||||
\
|
\
|
||||||
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.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 - \
|
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
|
||||||
|
|
@ -85,9 +85,9 @@ RUN set -ex \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
openssl-dev \
|
libressl-dev \
|
||||||
yaml-dev \
|
|
||||||
procps \
|
procps \
|
||||||
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
&& apk del .ruby-builddeps \
|
&& apk del .ruby-builddeps \
|
||||||
&& cd / \
|
&& cd / \
|
||||||
|
|
|
||||||
|
|
@ -30,20 +30,20 @@ RUN set -ex \
|
||||||
glib-dev \
|
glib-dev \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
|
libressl \
|
||||||
|
libressl-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
libxslt-dev \
|
libxslt-dev \
|
||||||
linux-headers \
|
linux-headers \
|
||||||
make \
|
make \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
openssl \
|
|
||||||
openssl-dev \
|
|
||||||
procps \
|
procps \
|
||||||
readline-dev \
|
readline-dev \
|
||||||
ruby \
|
ruby \
|
||||||
tar \
|
tar \
|
||||||
|
xz \
|
||||||
yaml-dev \
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
xz \
|
|
||||||
\
|
\
|
||||||
&& wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.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 - \
|
&& echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \
|
||||||
|
|
@ -85,9 +85,9 @@ RUN set -ex \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
openssl-dev \
|
libressl-dev \
|
||||||
yaml-dev \
|
|
||||||
procps \
|
procps \
|
||||||
|
yaml-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
&& apk del .ruby-builddeps \
|
&& apk del .ruby-builddeps \
|
||||||
&& cd / \
|
&& cd / \
|
||||||
|
|
|
||||||
|
|
@ -75,6 +75,10 @@ for version in "${versions[@]}"; do
|
||||||
-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
|
-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
|
||||||
"$template" > "$dir/Dockerfile"
|
"$template" > "$dir/Dockerfile"
|
||||||
|
|
||||||
|
if [ "$variant" = 'alpine3.4' ]; then
|
||||||
|
sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile"
|
||||||
|
fi
|
||||||
|
|
||||||
case "$v" in
|
case "$v" in
|
||||||
*/onbuild) ;;
|
*/onbuild) ;;
|
||||||
*)
|
*)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue