Add Alpine 3.14

Author: J0WI

2.6/alpine3.13/Dockerfile

@@ -29,6 +29,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \

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

@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -29,6 +29,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -67,6 +68,11 @@ RUN set -eux; \
 	echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
+# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
+	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

2.7/alpine3.13/Dockerfile

@@ -29,6 +29,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \

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

@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -29,6 +29,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \

3.0/alpine3.13/Dockerfile

@@ -29,6 +29,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \

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

@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 RUN apk add --no-cache \
 		gmp-dev
@@ -29,6 +29,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \

Dockerfile-alpine.template

@@ -30,6 +30,7 @@ RUN set -eux; \
 		ca-certificates \
 		coreutils \
 		dpkg-dev dpkg \
+		g++ \
 		gcc \
 		gdbm-dev \
 		glib-dev \
@@ -68,6 +69,11 @@ RUN set -eux; \
 	echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
+# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
+	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

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")"

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
+			'2.7'|'3.0')
+				sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile"
+				;;
 		esac
 
 		# https://github.com/docker-library/ruby/issues/246