Skip to content

Commit aa09376

Browse files
J0WIJ0WI
committed
Add Alpine 3.14
1 parent 57fbb48 commit aa09376

File tree

11 files changed

+50
-7
lines changed

11 files changed

+50
-7
lines changed

‎2.5/alpine3.13/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ RUN set -eux; \
6969
patch -p1 -i thread-stack-fix.patch; \
7070
rm thread-stack-fix.patch; \
7171
\
72+
# https://bugs.ruby-lang.org/issues/17723
73+
\
7274
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7375
# warning: Insecure world writable dir
7476
{ \

‎2.5/alpine3.12/Dockerfile renamed to ‎2.5/alpine3.14/Dockerfile

+7-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
@@ -69,6 +69,12 @@ RUN set -eux; \
6969
patch -p1 -i thread-stack-fix.patch; \
7070
rm thread-stack-fix.patch; \
7171
\
72+
# https://bugs.ruby-lang.org/issues/17723
73+
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
74+
echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
75+
patch -p1 -i autoconf-2.70.patch; \
76+
rm autoconf-2.70.patch; \
77+
\
7278
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7379
# warning: Insecure world writable dir
7480
{ \

‎2.6/alpine3.13/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ RUN set -eux; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
7070
\
71+
# https://bugs.ruby-lang.org/issues/17723
72+
\
7173
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7274
# warning: Insecure world writable dir
7375
{ \

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

+7-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
@@ -68,6 +68,12 @@ RUN set -eux; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
7070
\
71+
# https://bugs.ruby-lang.org/issues/17723
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; \
76+
\
7177
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7278
# warning: Insecure world writable dir
7379
{ \

‎2.7/alpine3.13/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ RUN set -eux; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
7070
\
71+
# https://bugs.ruby-lang.org/issues/17723
72+
\
7173
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7274
# warning: Insecure world writable dir
7375
{ \

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

+7-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
@@ -68,6 +68,12 @@ RUN set -eux; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
7070
\
71+
# https://bugs.ruby-lang.org/issues/17723
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; \
76+
\
7177
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7278
# warning: Insecure world writable dir
7379
{ \

‎3.0/alpine3.13/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ RUN set -eux; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
7070
\
71+
# https://bugs.ruby-lang.org/issues/17723
72+
\
7173
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7274
# warning: Insecure world writable dir
7375
{ \

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

+3-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
@@ -68,6 +68,8 @@ RUN set -eux; \
6868
patch -p1 -i thread-stack-fix.patch; \
6969
rm thread-stack-fix.patch; \
7070
\
71+
# https://bugs.ruby-lang.org/issues/17723
72+
\
7173
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7274
# warning: Insecure world writable dir
7375
{ \

‎Dockerfile-alpine.template

+6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ RUN set -eux; \
6969
patch -p1 -i thread-stack-fix.patch; \
7070
rm thread-stack-fix.patch; \
7171
\
72+
# https://bugs.ruby-lang.org/issues/17723
73+
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
74+
echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
75+
patch -p1 -i autoconf-2.70.patch; \
76+
rm autoconf-2.70.patch; \
77+
\
7278
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
7379
# warning: Insecure world writable dir
7480
{ \

‎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

+10-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,15 @@ 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+
'3.0')
99+
sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile"
100+
;;
92101
esac
93102

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

0 commit comments

Comments
 (0)