Add Debian bookworm, drop buster

Except in PHP 8.0 😞
docker-library · Jun 13, 2023 · 2729aaf · 2729aaf
1 parent ebd9f36
commit 2729aaf
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/10.0/php8.1/apache-buster/Dockerfile → 10.0/php8.1/apache-bookworm/Dockerfile b/10.0/php8.1/apache-buster/Dockerfile → 10.0/php8.1/apache-bookworm/Dockerfile
diff --git a/10.0/php8.1/fpm-buster/Dockerfile → 10.0/php8.1/fpm-bookworm/Dockerfile b/10.0/php8.1/fpm-buster/Dockerfile → 10.0/php8.1/fpm-bookworm/Dockerfile
diff --git a/10.0/php8.2/apache-buster/Dockerfile → 10.0/php8.2/apache-bookworm/Dockerfile b/10.0/php8.2/apache-buster/Dockerfile → 10.0/php8.2/apache-bookworm/Dockerfile
diff --git a/10.0/php8.2/fpm-buster/Dockerfile → 10.0/php8.2/fpm-bookworm/Dockerfile b/10.0/php8.2/fpm-buster/Dockerfile → 10.0/php8.2/fpm-bookworm/Dockerfile
diff --git a/9.4/php8.1/apache-buster/Dockerfile → 9.4/php8.1/apache-bookworm/Dockerfile b/9.4/php8.1/apache-buster/Dockerfile → 9.4/php8.1/apache-bookworm/Dockerfile
diff --git a/9.4/php8.1/fpm-buster/Dockerfile → 9.4/php8.1/fpm-bookworm/Dockerfile b/9.4/php8.1/fpm-buster/Dockerfile → 9.4/php8.1/fpm-bookworm/Dockerfile
diff --git a/9.5/php8.1/apache-buster/Dockerfile → 9.5/php8.1/apache-bookworm/Dockerfile b/9.5/php8.1/apache-buster/Dockerfile → 9.5/php8.1/apache-bookworm/Dockerfile
diff --git a/9.5/php8.1/fpm-buster/Dockerfile → 9.5/php8.1/fpm-bookworm/Dockerfile b/9.5/php8.1/fpm-buster/Dockerfile → 9.5/php8.1/fpm-bookworm/Dockerfile
diff --git a/apply-templates.sh b/apply-templates.sh
@@ -43,6 +43,12 @@ for version; do
 		for variant in "${variants[@]}"; do
 			export variant
 
+			# https://github.com/docker-library/php/blob/86b8b13760c7d7c6120fb635f6a1c84b22f33386/versions.sh#L99-L105
+			if [ "$phpVersion" = '8.0' ] && [[ "$variant" = *-'bookworm' ]]; then
+				continue
+			elif [ "$phpVersion" != '8.0' ] &&  [[ "$variant" = *-'buster' ]]; then
+				continue
+			fi
 			# https://github.com/docker-library/php/blob/0a68eaa2d3a269079c687e55abc960c77d3a134e/versions.sh#L94-L101
 			if [[ "$variant" = *-'alpine3.16' ]] && [ "$phpVersion" != '8.0' ]; then
 				continue

diff --git a/versions.json b/versions.json
@@ -8,10 +8,10 @@
       "8.1"
     ],
     "variants": [
+      "apache-bookworm",
+      "fpm-bookworm",
       "apache-bullseye",
       "fpm-bullseye",
-      "apache-buster",
-      "fpm-buster",
       "fpm-alpine3.18",
       "fpm-alpine3.17"
     ],
@@ -23,6 +23,8 @@
       "8.0"
     ],
     "variants": [
+      "apache-bookworm",
+      "fpm-bookworm",
       "apache-bullseye",
       "fpm-bullseye",
       "apache-buster",
@@ -42,6 +44,8 @@
       "8.0"
     ],
     "variants": [
+      "apache-bookworm",
+      "fpm-bookworm",
       "apache-bullseye",
       "fpm-bullseye",
       "apache-buster",
@@ -61,6 +65,8 @@
       "8.0"
     ],
     "variants": [
+      "apache-bookworm",
+      "fpm-bookworm",
       "apache-bullseye",
       "fpm-bullseye",
       "apache-buster",

diff --git a/versions.sh b/versions.sh
@@ -102,8 +102,9 @@ for version in "${versions[@]}"; do
 					),
 				} + $doc
 				| .variants = [
+					"bookworm",
 					"bullseye",
-					"buster",
+					if .phpVersions | index("8.0") then "buster" else empty end, # https://github.com/docker-library/php/blob/86b8b13760c7d7c6120fb635f6a1c84b22f33386/versions.sh#L99-L105
 					"alpine3.18",
 					"alpine3.17",
 					if .phpVersions | index("8.0") then "alpine3.16" else empty end, # https://github.com/docker-library/php/blob/0a68eaa2d3a269079c687e55abc960c77d3a134e/versions.sh#L94-L101