kotovalexarian-likes-github
/
docker-library--ruby
mirror of https://github.com/docker-library/ruby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #370 from infosiftr/alpine3.15 

Update to Alpine 3.15
This commit is contained in:
Tianon Gravi 2021-11-29 12:31:36 -08:00 committed by GitHub
parent c57d85bd87 1e1d46db15
commit 05ed05e338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
2.6/alpine3.13/Dockerfile → 2.6/alpine3.15/Dockerfile generated
View File

@ -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; \
\

2
2.7/alpine3.13/Dockerfile → 2.7/alpine3.15/Dockerfile generated
View File

@ -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 \

2
3.0/alpine3.13/Dockerfile → 3.0/alpine3.15/Dockerfile generated
View File

@ -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 \

2
3.1-rc/alpine3.13/Dockerfile → 3.1-rc/alpine3.15/Dockerfile generated
View File

@ -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 \

16
versions.json
View File

@ -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"
}

4
versions.sh
View File

@ -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" + .)
],
}