Update versions.* and generate-stackbrew for bullseye

Author: yosifkit

Dockerfile-alpine.template

@@ -163,7 +163,7 @@ RUN set -eux; \
 		\
 {{ ) else "" end -}}
 # bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
+# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-musl' && echo '--without-pcre-jit') \
 		\
 		${PHP_EXTRA_CONFIGURE_ARGS:-} \

Dockerfile-debian.template

@@ -99,21 +99,6 @@ COPY docker-php-source /usr/local/bin/
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
-{{
-	# stretch needs to pull argon2 from buster
-	if env.suite == "stretch" then (
--}}
-	sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \
-	{ \
-		echo 'Package: *'; \
-		echo 'Pin: release n=buster*'; \
-		echo 'Pin-Priority: -10'; \
-		echo; \
-		echo 'Package: libargon2*'; \
-		echo 'Pin: release n=buster*'; \
-		echo 'Pin-Priority: 990'; \
-	} > /etc/apt/preferences.d/argon2-buster; \
-{{ ) else "" end -}}
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libargon2-dev \
@@ -190,7 +175,7 @@ RUN set -eux; \
 		\
 {{ ) else "" end -}}
 # bundled pcre does not support JIT on s390x
-# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
+# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
 		$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
 		--with-libdir="lib/$debMultiarch" \
 		\
@@ -240,7 +225,7 @@ RUN docker-php-ext-enable sodium
 	# https://bugs.php.net/bug.php?id=76324
 	# https://github.com/php/php-src/pull/3632
 	# https://github.com/php/php-src/commit/2d03197749696ac3f8effba6b7977b0d8729fef3
-	if env.suite != "stretch" and (.version | version_id) < ("7.4" | version_id) then (
+	if (.version | version_id) < ("7.4" | version_id) then (
 -}}
 # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
 RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config

apply-templates.sh

@@ -55,6 +55,7 @@ for version; do
 		export cmd
 
 		echo "processing $version/$dir ..."
+		mkdir -p "$version/$dir"
 
 		variantBlock1="$(if [ -f "Dockerfile-$variant-block-1.template" ]; then gawk -f "$jqt" "Dockerfile-$variant-block-1.template"; fi)"
 		variantBlock2="$(if [ -f "Dockerfile-$variant-block-2.template" ]; then gawk -f "$jqt" "Dockerfile-$variant-block-2.template"; fi)"

generate-stackbrew-library.sh

@@ -6,9 +6,9 @@ declare -A aliases=(
 	[8.0]='8 latest'
 )
 
-defaultDebianSuite='buster'
+defaultDebianSuite='bullseye'
 declare -A debianSuites=(
-	#[7.4-rc]='buster'
+	#[7.4]='buster'
 )
 defaultAlpineVersion='3.14'
 declare -A alpineVersions=(

versions.json

@@ -5,14 +5,14 @@
     "sha256": "7db2834511f3d86272dca3daee3f395a5a4afce359b8342aa6edad80e12eb4d0",
     "url": "https://www.php.net/distributions/php-7.3.29.tar.xz",
     "variants": [
+      "bullseye/cli",
+      "bullseye/apache",
+      "bullseye/fpm",
+      "bullseye/zts",
       "buster/cli",
       "buster/apache",
       "buster/fpm",
       "buster/zts",
-      "stretch/cli",
-      "stretch/apache",
-      "stretch/fpm",
-      "stretch/zts",
       "alpine3.14/cli",
       "alpine3.14/fpm",
       "alpine3.14/zts",
@@ -28,6 +28,10 @@
     "sha256": "8e078cd7d2f49ac3fcff902490a5bb1addc885e7e3b0d8dd068f42c68297bde8",
     "url": "https://www.php.net/distributions/php-7.4.22.tar.xz",
     "variants": [
+      "bullseye/cli",
+      "bullseye/apache",
+      "bullseye/fpm",
+      "bullseye/zts",
       "buster/cli",
       "buster/apache",
       "buster/fpm",
@@ -47,6 +51,10 @@
     "sha256": "71a01b2b56544e20e28696ad5b366e431a0984eaa39aa5e35426a4843e172010",
     "url": "https://www.php.net/distributions/php-8.0.9.tar.xz",
     "variants": [
+      "bullseye/cli",
+      "bullseye/apache",
+      "bullseye/fpm",
+      "bullseye/zts",
       "buster/cli",
       "buster/apache",
       "buster/fpm",
@@ -64,6 +72,10 @@
     "sha256": "c0b8d45639f171fcbbaaf6b239a4759126130cf14628eaf74c4916408cb16ce0",
     "url": "https://downloads.php.net/~ramsey/php-8.1.0beta2.tar.xz",
     "variants": [
+      "bullseye/cli",
+      "bullseye/apache",
+      "bullseye/fpm",
+      "bullseye/zts",
       "buster/cli",
       "buster/apache",
       "buster/fpm",

versions.sh

@@ -117,13 +117,20 @@ for version in "${versions[@]}"; do
 	variants='[]'
 	# order here controls the order of the library/ file
 	for suite in \
+		bullseye \
 		buster \
-		stretch \
 		alpine3.14 \
 		alpine3.13 \
 	; do
 		for variant in cli apache fpm zts; do
-			[ -d "$version/$suite/$variant" ] || continue
+			if [[ "$suite" = alpine* ]]; then
+				if [ "$variant" = 'apache' ]; then
+					continue
+				elif [ "$variant" = 'zts' ] && [[ "$rcVersion" != 7.* ]]; then
+					# https://github.com/docker-library/php/issues/1074
+					continue
+				fi
+			fi
 			export suite variant
 			variants="$(jq <<<"$variants" -c '. + [ env.suite + "/" + env.variant ]')"
 		done