From ebfa3afb935795153b9aa2b7fb60b16146ed3433 Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <j.noordsij@sslleiden.nl>
Date: Mon, 5 Jan 2026 10:11:08 +0100
Subject: [PATCH 1/2] Drop all Alpine 3.21 related references now 8.1 is EOl

---
 Dockerfile-linux.template | 1 -
 versions.sh               | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index ade520370..3adc12e5d 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -27,7 +27,6 @@
 		# https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c"
 		env.variant == "zts" # only needed for ZTS builds
 		and is_alpine
-		and env.from != "alpine:3.21" # only needed for Alpine 3.22+
 		and IN(rcVersion; "8.2")
 -}}
 FROM {{ env.from }}
diff --git a/versions.sh b/versions.sh
index 2caffffe0..5bfe73c46 100755
--- a/versions.sh
+++ b/versions.sh
@@ -84,21 +84,12 @@ for version in "${versions[@]}"; do
 		bookworm \
 		alpine3.23 \
 		alpine3.22 \
-		alpine3.21 \
 	; do
 		for variant in cli apache fpm zts; do
 			if [[ "$suite" = alpine* ]]; then
 				if [ "$variant" = 'apache' ]; then
 					continue
 				fi
-				if [[ "$rcVersion" = '8.1' ]] && [[ "$suite" = 'alpine3.23' ]]; then
-					# Keep PHP 8.1 with Alpine 3.21 default until end of year; see also https://github.com/docker-library/php/blob/9ab2e4b37addffaa10f06d9e5f54f7bd1f5ef18f/generate-stackbrew-library.sh#L120
-					continue
-				fi
-				if [[ "$rcVersion" != '8.1' ]] && [[ "$suite" = 'alpine3.21' ]]; then
-					# Keep Alpine 3.21 just for 8.1
-					continue
-				fi
 			fi
 			export suite variant
 			variants="$(jq <<<"$variants" -c '. + [ env.suite + "/" + env.variant ]')"

From 7a424127dea1c8ee706eaddab75bcd3c6ec4c5a0 Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <j.noordsij@sslleiden.nl>
Date: Mon, 5 Jan 2026 10:20:44 +0100
Subject: [PATCH 2/2] Cleanup logic for 18743.patch

---
 Dockerfile-linux.template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 3adc12e5d..6df0df720 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -273,7 +273,7 @@ RUN set -eux; \
 			"libsodium-dev",
 			"libxml2-dev",
 			"openssl-dev",
-			# https://github.com/docker-library/php/pull/1580 (14834)
+			# https://github.com/docker-library/php/pull/1580 (18743)
 			if need_patch_18743 then "patch", "patchutils" else empty end,
 			"readline-dev",
 			"sqlite-dev",
@@ -318,15 +318,11 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
-{{
-	if need_patch_18743 then
-		{ url: "https://github.com/php/php-src/commit/b3c8afe272a6919248986c703c2e1defc73ff707.patch?full_index=1", sha256: "b334f73434c9732a4b27a42eb5d417e10df842e854c02a3e753b2479f8978bf5" }
-		| (
--}}
+{{ if need_patch_18743 then ( -}}
 	# https://github.com/php/php-src/issues/18743 "Incompatibility in Inline TLS Assembly on Alpine 3.22 with zend_jit_ir.c"
 	# https://github.com/docker-library/php/pull/1580
-	curl -fL {{ .url | @sh }} -o 18743.patch; \
-	echo {{ "\(.sha256) *18743.patch" | @sh }} | sha256sum -c -; \
+	curl -fL 'https://github.com/php/php-src/commit/b3c8afe272a6919248986c703c2e1defc73ff707.patch?full_index=1' -o 18743.patch; \
+	echo 'b334f73434c9732a4b27a42eb5d417e10df842e854c02a3e753b2479f8978bf5 *18743.patch' | sha256sum -c -; \
 	filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
 	rm 18743.patch; \
 {{ ) else "" end -}}