mirror of
https://github.com/docker-library/ruby.git
synced 2022-11-09 11:41:34 -05:00
Add Alpine 3.14
Also add "g++" during compilation (the upstream configure script looks for it, even though it doesn't appear to be used).
This commit is contained in:
J0WI
Tianon Gravi
parent
761ae37f67
commit
0c5948bcce
13 changed files with 47 additions and 11 deletions
1
2.6/alpine3.13/Dockerfile
generated
1
2.6/alpine3.13/Dockerfile
generated
|
|
@ -43,6 +43,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.12
|
||||
FROM alpine:3.14
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
||||
|
|
@ -43,6 +43,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
|
|
@ -82,6 +83,13 @@ RUN set -eux; \
|
|||
patch -p1 -i thread-stack-fix.patch; \
|
||||
rm thread-stack-fix.patch; \
|
||||
\
|
||||
# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
|
||||
# https://github.com/ruby/ruby/pull/3773
|
||||
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
|
||||
echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
|
||||
patch -p1 -i autoconf-2.70.patch; \
|
||||
rm autoconf-2.70.patch; \
|
||||
\
|
||||
# the configure script does not detect isnan/isinf as macros
|
||||
export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \
|
||||
\
|
||||
1
2.6/slim-buster/Dockerfile
generated
1
2.6/slim-buster/Dockerfile
generated
|
|
@ -45,6 +45,7 @@ RUN set -eux; \
|
|||
libgdbm-dev \
|
||||
ruby \
|
||||
autoconf \
|
||||
g++ \
|
||||
gcc \
|
||||
libbz2-dev \
|
||||
libglib2.0-dev \
|
||||
|
|
|
|||
1
2.6/slim-stretch/Dockerfile
generated
1
2.6/slim-stretch/Dockerfile
generated
|
|
@ -45,6 +45,7 @@ RUN set -eux; \
|
|||
libgdbm-dev \
|
||||
ruby \
|
||||
autoconf \
|
||||
g++ \
|
||||
gcc \
|
||||
libbz2-dev \
|
||||
libglib2.0-dev \
|
||||
|
|
|
|||
1
2.7/alpine3.13/Dockerfile
generated
1
2.7/alpine3.13/Dockerfile
generated
|
|
@ -43,6 +43,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.12
|
||||
FROM alpine:3.14
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
||||
|
|
@ -43,6 +43,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
1
2.7/slim-buster/Dockerfile
generated
1
2.7/slim-buster/Dockerfile
generated
|
|
@ -45,6 +45,7 @@ RUN set -eux; \
|
|||
libgdbm-dev \
|
||||
ruby \
|
||||
autoconf \
|
||||
g++ \
|
||||
gcc \
|
||||
libbz2-dev \
|
||||
libglib2.0-dev \
|
||||
|
|
|
|||
1
3.0/alpine3.13/Dockerfile
generated
1
3.0/alpine3.13/Dockerfile
generated
|
|
@ -43,6 +43,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.12
|
||||
FROM alpine:3.14
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
||||
|
|
@ -43,6 +43,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
1
3.0/slim-buster/Dockerfile
generated
1
3.0/slim-buster/Dockerfile
generated
|
|
@ -45,6 +45,7 @@ RUN set -eux; \
|
|||
libgdbm-dev \
|
||||
ruby \
|
||||
autoconf \
|
||||
g++ \
|
||||
gcc \
|
||||
libbz2-dev \
|
||||
libglib2.0-dev \
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ RUN set -eux; \
|
|||
ca-certificates \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
g++ \
|
||||
gcc \
|
||||
gdbm-dev \
|
||||
glib-dev \
|
||||
|
|
@ -99,6 +100,7 @@ RUN set -eux; \
|
|||
ruby \
|
||||
{{ if is_slim then ( -}}
|
||||
autoconf \
|
||||
g++ \
|
||||
gcc \
|
||||
libbz2-dev \
|
||||
libglib2.0-dev \
|
||||
|
|
@ -136,6 +138,23 @@ RUN set -eux; \
|
|||
patch -p1 -i thread-stack-fix.patch; \
|
||||
rm thread-stack-fix.patch; \
|
||||
\
|
||||
{{
|
||||
{
|
||||
"2.6": {
|
||||
url: "https://github.com/ruby/ruby/pull/3773",
|
||||
commit: "fcc88da5eb162043adcba552646677d2ab5adf55",
|
||||
sha256: "62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54",
|
||||
},
|
||||
}[env.version] | if . and env.variant != "alpine3.13" then (
|
||||
-}}
|
||||
# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
|
||||
# {{ .url }}
|
||||
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; \
|
||||
rm autoconf-2.70.patch; \
|
||||
\
|
||||
{{ ) else "" end -}}
|
||||
# the configure script does not detect isnan/isinf as macros
|
||||
export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
"slim-buster",
|
||||
"stretch",
|
||||
"slim-stretch",
|
||||
"alpine3.13",
|
||||
"alpine3.12"
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
],
|
||||
"version": "2.6.8"
|
||||
},
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
"variants": [
|
||||
"buster",
|
||||
"slim-buster",
|
||||
"alpine3.13",
|
||||
"alpine3.12"
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
],
|
||||
"version": "2.7.4"
|
||||
},
|
||||
|
|
@ -26,8 +26,8 @@
|
|||
"variants": [
|
||||
"buster",
|
||||
"slim-buster",
|
||||
"alpine3.13",
|
||||
"alpine3.12"
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
],
|
||||
"version": "3.0.2"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ for version in "${versions[@]}"; do
|
|||
else empty end
|
||||
| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
|
||||
(
|
||||
"3.13",
|
||||
"3.12"
|
||||
"3.14",
|
||||
"3.13"
|
||||
| "alpine" + .)
|
||||
],
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue