Skip to content

Commit d035a1f

Browse files
committed
Add Alpine 3.14
1 parent 6fe76a8 commit d035a1f

File tree

6 files changed

+36
-6
lines changed

6 files changed

+36
-6
lines changed

2.6/alpine3.12/Dockerfile renamed to 2.6/alpine3.14/Dockerfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.12
1+
FROM alpine:3.14
22

33
RUN apk add --no-cache \
44
gmp-dev
@@ -67,6 +67,11 @@ RUN set -eux; \
6767
echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
70+
# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
71+
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
72+
echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
73+
patch -p1 -i autoconf-2.70.patch; \
74+
rm autoconf-2.70.patch; \
7075
\
7176
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7277
# warning: Insecure world writable dir

2.7/alpine3.12/Dockerfile renamed to 2.7/alpine3.14/Dockerfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.12
1+
FROM alpine:3.14
22

33
RUN apk add --no-cache \
44
gmp-dev
@@ -67,6 +67,11 @@ RUN set -eux; \
6767
echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
70+
# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
71+
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/29bbad939939c6dceb804aac667ba372fdee4ef5.patch'; \
72+
echo '7dd6142e83d120968d12a0695b1c8f52380fe9bfec99381c2486f6b65c997f30 *autoconf-2.70.patch' | sha256sum --check --strict; \
73+
patch -p1 -i autoconf-2.70.patch; \
74+
rm autoconf-2.70.patch; \
7075
\
7176
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7277
# warning: Insecure world writable dir

3.0/alpine3.12/Dockerfile renamed to 3.0/alpine3.14/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.12
1+
FROM alpine:3.14
22

33
RUN apk add --no-cache \
44
gmp-dev

Dockerfile-alpine.template

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ RUN set -eux; \
6868
echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
6969
patch -p1 -i thread-stack-fix.patch; \
7070
rm thread-stack-fix.patch; \
71+
# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
72+
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
73+
echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
74+
patch -p1 -i autoconf-2.70.patch; \
75+
rm autoconf-2.70.patch; \
7176
\
7277
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7378
# warning: Insecure world writable dir

generate-stackbrew-library.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defaultDebianSuite='buster'
1010
declare -A debianSuites=(
1111
#[2.7]='buster'
1212
)
13-
defaultAlpineVersion='3.13'
13+
defaultAlpineVersion='3.14'
1414
declare -A alpineVersion=(
1515
#[2.3]='3.8'
1616
)
@@ -80,7 +80,7 @@ join() {
8080
for version in "${versions[@]}"; do
8181
for v in \
8282
{buster,stretch}{,/slim} \
83-
alpine{3.13,3.12} \
83+
alpine{3.14,3.13} \
8484
; do
8585
dir="$version/$v"
8686
variant="$(basename "$v")"

update.sh

+16-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ for version in "${versions[@]}"; do
5858
echo "$version: $fullVersion; $shaVal"
5959

6060
for v in \
61-
alpine{3.13,3.12} \
61+
alpine{3.14,3.13} \
6262
{stretch,buster}{/slim,} \
6363
; do
6464
dir="$version/$v"
@@ -89,6 +89,21 @@ for version in "${versions[@]}"; do
8989
stretch/slim)
9090
sed -i -e '/libgdbm-compat-dev/d' "$dir/Dockerfile"
9191
;;
92+
alpine3.13)
93+
sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile"
94+
;;
95+
esac
96+
97+
case "$version" in
98+
'2.7')
99+
sed -i \
100+
-e 's/62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54/7dd6142e83d120968d12a0695b1c8f52380fe9bfec99381c2486f6b65c997f30/g' \
101+
-e 's/fcc88da5eb162043adcba552646677d2ab5adf55/29bbad939939c6dceb804aac667ba372fdee4ef5/g' \
102+
"$dir/Dockerfile"
103+
;;
104+
'3.0')
105+
sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile"
106+
;;
92107
esac
93108

94109
# https://github.com/docker-library/ruby/issues/246

0 commit comments

Comments
 (0)