mirror of
https://github.com/docker-library/ruby.git
synced 2022-11-09 11:41:34 -05:00
Merge pull request #370 from infosiftr/alpine3.15
Update to Alpine 3.15
This commit is contained in:
commit
05ed05e338
6 changed files with 20 additions and 14 deletions
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.13
|
||||
FROM alpine:3.15
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
||||
|
@ -83,6 +83,12 @@ 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'; \
|
||||
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; \
|
||||
\
|
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.13
|
||||
FROM alpine:3.15
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.13
|
||||
FROM alpine:3.15
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
|
@ -4,7 +4,7 @@
|
|||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM alpine:3.13
|
||||
FROM alpine:3.15
|
||||
|
||||
RUN set -eux; \
|
||||
apk add --no-cache \
|
|
@ -6,8 +6,8 @@
|
|||
"slim-bullseye",
|
||||
"buster",
|
||||
"slim-buster",
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
"alpine3.15",
|
||||
"alpine3.14"
|
||||
],
|
||||
"version": "2.6.9"
|
||||
},
|
||||
|
@ -18,8 +18,8 @@
|
|||
"slim-bullseye",
|
||||
"buster",
|
||||
"slim-buster",
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
"alpine3.15",
|
||||
"alpine3.14"
|
||||
],
|
||||
"version": "2.7.5"
|
||||
},
|
||||
|
@ -30,8 +30,8 @@
|
|||
"slim-bullseye",
|
||||
"buster",
|
||||
"slim-buster",
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
"alpine3.15",
|
||||
"alpine3.14"
|
||||
],
|
||||
"version": "3.0.3"
|
||||
},
|
||||
|
@ -42,8 +42,8 @@
|
|||
"slim-bullseye",
|
||||
"buster",
|
||||
"slim-buster",
|
||||
"alpine3.14",
|
||||
"alpine3.13"
|
||||
"alpine3.15",
|
||||
"alpine3.14"
|
||||
],
|
||||
"version": "3.1.0-preview1"
|
||||
}
|
||||
|
|
|
@ -72,8 +72,8 @@ for version in "${versions[@]}"; do
|
|||
"buster"
|
||||
| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
|
||||
(
|
||||
"3.14",
|
||||
"3.13"
|
||||
"3.15",
|
||||
"3.14"
|
||||
| "alpine" + .)
|
||||
],
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue