Add Alpine 3.14

J0WI · J0WI · commit aa0937667cfe · 2021-06-16T17:27:05.000+02:00
diff --git a/2.5/alpine3.13/Dockerfile b/2.5/alpine3.13/Dockerfile
@@ -69,6 +69,8 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/2.5/alpine3.14/Dockerfile b/2.5/alpine3.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -69,6 +69,12 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	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; \
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile
@@ -68,6 +68,8 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -68,6 +68,12 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	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; \
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile
@@ -68,6 +68,8 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/2.7/alpine3.14/Dockerfile b/2.7/alpine3.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -68,6 +68,12 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	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; \
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile
@@ -68,6 +68,8 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/3.0/alpine3.14/Dockerfile b/3.0/alpine3.14/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -68,6 +68,8 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -69,6 +69,12 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+# https://bugs.ruby-lang.org/issues/17723
+	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; \
+	\
 # hack in "ENABLE_PATH_CHECK" disabling to suppress:
 #   warning: Insecure world writable dir
 	{ \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -10,7 +10,7 @@ defaultDebianSuite='buster'
 declare -A debianSuites=(
 	#[2.7]='buster'
 )
-defaultAlpineVersion='3.13'
+defaultAlpineVersion='3.14'
 declare -A alpineVersion=(
 	#[2.3]='3.8'
 )
@@ -80,7 +80,7 @@ join() {
 for version in "${versions[@]}"; do
 	for v in \
 		{buster,stretch}{,/slim} \
-		alpine{3.13,3.12} \
+		alpine{3.14,3.13} \
 	; do
 		dir="$version/$v"
 		variant="$(basename "$v")"
diff --git a/update.sh b/update.sh
@@ -58,7 +58,7 @@ for version in "${versions[@]}"; do
 	echo "$version: $fullVersion; $shaVal"
 
 	for v in \
-		alpine{3.13,3.12} \
+		alpine{3.14,3.13} \
 		{stretch,buster}{/slim,} \
 	; do
 		dir="$version/$v"
@@ -89,6 +89,15 @@ for version in "${versions[@]}"; do
 			stretch/slim)
 				sed -i -e '/libgdbm-compat-dev/d' "$dir/Dockerfile"
 				;;
+			alpine3.13)
+				sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile"
+				;;
+		esac
+
+		case "$version" in
+			'3.0')
+				sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile"
+				;;
 		esac
 
 		# https://github.com/docker-library/ruby/issues/246

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ RUN set -eux; \`
`69`	`69`	`patch -p1 -i thread-stack-fix.patch; \`
`70`	`70`	`rm thread-stack-fix.patch; \`
`71`	`71`	`\`
	`72`	`+# https://bugs.ruby-lang.org/issues/17723`
	`73`	`+ \`
`72`	`74`	`# hack in "ENABLE_PATH_CHECK" disabling to suppress:`
`73`	`75`	`# warning: Insecure world writable dir`
`74`	`76`	`{ \`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ RUN set -eux; \`
`68`	`68`	`patch -p1 -i thread-stack-fix.patch; \`
`69`	`69`	`rm thread-stack-fix.patch; \`
`70`	`70`	`\`
	`71`	`+# https://bugs.ruby-lang.org/issues/17723`
	`72`	`+ \`
`71`	`73`	`# hack in "ENABLE_PATH_CHECK" disabling to suppress:`
`72`	`74`	`# warning: Insecure world writable dir`
`73`	`75`	`{ \`