Add Alpine 3.14

Author: J0WI

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

@@ -136,6 +136,28 @@ RUN set -eux; \
 	patch -p1 -i thread-stack-fix.patch; \
 	rm thread-stack-fix.patch; \
 	\
+{{
+	{
+		"2.6": {
+			url: "https://github.com/ruby/ruby/pull/3773",
+			commit: "fcc88da5eb162043adcba552646677d2ab5adf55",
+			sha256: "62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54",
+		},
+		"2.7": {
+			url: "https://github.com/ruby/ruby/pull/4359",
+			commit: "2f4e2ae7e0f8cdf76360493da2c2201f9ec9a7e2",
+			sha256: "498852b991bf70132205ed37137630dbcad201a33b24a69dac2fb87b9cd5daf0",
+		},
+	}[env.version] | if . and env.variant != "alpine3.13" then (
+-}}
+# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
+# {{ .url }}
+	wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \
+	echo '{{ .sha256 }} *autoconf-2.70.patch' | sha256sum --check --strict; \
+	patch -p1 -i autoconf-2.70.patch; \
+	rm autoconf-2.70.patch; \
+	\
+{{ ) else "" end -}}
 # the configure script does not detect isnan/isinf as macros
 	export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \
 	\

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

@@ -74,10 +74,20 @@ join() {
 	echo "${out#$sep}"
 }
 
+<<<<<<< HEAD
 for version; do
 	export version
 	variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)"
 	eval "variants=( $variants )"
+=======
+for version in "${versions[@]}"; do
+	for v in \
+		{buster,stretch}{,/slim} \
+		alpine{3.14,3.13} \
+	; do
+		dir="$version/$v"
+		variant="$(basename "$v")"
+>>>>>>> d035a1f (Add Alpine 3.14)
 
 	fullVersion="$(jq -r '.[env.version].version' versions.json)"
 

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

@@ -6,8 +6,8 @@
       "slim-buster",
       "stretch",
       "slim-stretch",
-      "alpine3.13",
-      "alpine3.12"
+      "alpine3.14",
+      "alpine3.13"
     ],
     "version": "2.6.7"
   },
@@ -16,8 +16,8 @@
     "variants": [
       "buster",
       "slim-buster",
-      "alpine3.13",
-      "alpine3.12"
+      "alpine3.14",
+      "alpine3.13"
     ],
     "version": "2.7.3"
   },
@@ -26,8 +26,8 @@
     "variants": [
       "buster",
       "slim-buster",
-      "alpine3.13",
-      "alpine3.12"
+      "alpine3.14",
+      "alpine3.13"
     ],
     "version": "3.0.1"
   }

Dockerfile.template

@@ -74,8 +74,8 @@ for version in "${versions[@]}"; do
 					else empty end
 				| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
 				(
-					"3.13",
-					"3.12"
+					"3.14",
+					"3.13"
 				| "alpine" + .)
 			],
 		}