Merge pull request #252 from infosiftr/eol-and-new

Add 10.2-rc and drop eol 9.x
docker-library · Dec 5, 2023 · 927f080 · 927f080
2 parents ee9db81 + 9df694c
commit 927f080
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 34 deletions.
diff --git a/9.5/php8.2/apache-bookworm/Dockerfile → 10.2-rc/php8.2/apache-bookworm/Dockerfile b/9.5/php8.2/apache-bookworm/Dockerfile → 10.2-rc/php8.2/apache-bookworm/Dockerfile
diff --git a/9.5/php8.2/apache-bullseye/Dockerfile → 10.2-rc/php8.2/apache-bullseye/Dockerfile b/9.5/php8.2/apache-bullseye/Dockerfile → 10.2-rc/php8.2/apache-bullseye/Dockerfile
diff --git a/9.5/php8.2/fpm-alpine3.17/Dockerfile → 10.2-rc/php8.2/fpm-alpine3.17/Dockerfile b/9.5/php8.2/fpm-alpine3.17/Dockerfile → 10.2-rc/php8.2/fpm-alpine3.17/Dockerfile
diff --git a/9.5/php8.2/fpm-alpine3.18/Dockerfile → 10.2-rc/php8.2/fpm-alpine3.18/Dockerfile b/9.5/php8.2/fpm-alpine3.18/Dockerfile → 10.2-rc/php8.2/fpm-alpine3.18/Dockerfile
diff --git a/9.5/php8.2/fpm-bookworm/Dockerfile → 10.2-rc/php8.2/fpm-bookworm/Dockerfile b/9.5/php8.2/fpm-bookworm/Dockerfile → 10.2-rc/php8.2/fpm-bookworm/Dockerfile
diff --git a/9.5/php8.2/fpm-bullseye/Dockerfile → 10.2-rc/php8.2/fpm-bullseye/Dockerfile b/9.5/php8.2/fpm-bullseye/Dockerfile → 10.2-rc/php8.2/fpm-bullseye/Dockerfile
diff --git a/9.5/php8.1/fpm-bookworm/Dockerfile → 10.2-rc/php8.3/apache-bookworm/Dockerfile b/9.5/php8.1/fpm-bookworm/Dockerfile → 10.2-rc/php8.3/apache-bookworm/Dockerfile
diff --git a/9.5/php8.1/fpm-bullseye/Dockerfile → 10.2-rc/php8.3/apache-bullseye/Dockerfile b/9.5/php8.1/fpm-bullseye/Dockerfile → 10.2-rc/php8.3/apache-bullseye/Dockerfile
diff --git a/9.5/php8.1/fpm-alpine3.17/Dockerfile → 10.2-rc/php8.3/fpm-alpine3.17/Dockerfile b/9.5/php8.1/fpm-alpine3.17/Dockerfile → 10.2-rc/php8.3/fpm-alpine3.17/Dockerfile
diff --git a/9.5/php8.1/fpm-alpine3.18/Dockerfile → 10.2-rc/php8.3/fpm-alpine3.18/Dockerfile b/9.5/php8.1/fpm-alpine3.18/Dockerfile → 10.2-rc/php8.3/fpm-alpine3.18/Dockerfile
diff --git a/9.5/php8.1/apache-bookworm/Dockerfile → 10.2-rc/php8.3/fpm-bookworm/Dockerfile b/9.5/php8.1/apache-bookworm/Dockerfile → 10.2-rc/php8.3/fpm-bookworm/Dockerfile
diff --git a/9.5/php8.1/apache-bullseye/Dockerfile → 10.2-rc/php8.3/fpm-bullseye/Dockerfile b/9.5/php8.1/apache-bullseye/Dockerfile → 10.2-rc/php8.3/fpm-bullseye/Dockerfile
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -2,22 +2,20 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[9.5]='9'
 	[10.1]='10 latest'
 	[10.2-rc]='rc'
 )
 
 defaultDebianSuite='bookworm'
 declare -A debianSuites=(
-	#[9.2]='buster'
+	#[10.0]='bullseye'
 )
 
 defaultPhpVersion='php8.2'
 declare -A defaultPhpVersions=(
 # https://www.drupal.org/docs/7/system-requirements/php-requirements#php_required
 	[7]='php8.1' # PHP 7.4 & 8.0 are EOL, so we don't have a choice but to update the default
 # https://www.drupal.org/docs/system-requirements/php-requirements
-	[9.5]='php8.1'
 )
 
 self="$(basename "$BASH_SOURCE")"

diff --git a/versions.json b/versions.json
@@ -35,11 +35,13 @@
     ],
     "version": "10.1.6"
   },
-  "7": {
-    "md5": "4139f0feecb44a53645242194809b73a",
+  "10.2-rc": {
+    "composer": {
+      "version": "2"
+    },
     "phpVersions": [
-      "8.2",
-      "8.1"
+      "8.3",
+      "8.2"
     ],
     "variants": [
       "apache-bookworm",
@@ -49,12 +51,10 @@
       "fpm-alpine3.18",
       "fpm-alpine3.17"
     ],
-    "version": "7.98"
+    "version": "10.2.0-rc1"
   },
-  "9.5": {
-    "composer": {
-      "version": "2"
-    },
+  "7": {
+    "md5": "4139f0feecb44a53645242194809b73a",
     "phpVersions": [
       "8.2",
       "8.1"
@@ -67,6 +67,6 @@
       "fpm-alpine3.18",
       "fpm-alpine3.17"
     ],
-    "version": "9.5.11"
+    "version": "7.98"
   }
 }
diff --git a/versions.sh b/versions.sh
@@ -29,8 +29,8 @@ for version in "${versions[@]}"; do
 			drupalRelease="${rcVersion%%.*}.x"
 			;;
 		*)
-			# there is no https://updates.drupal.org/release-history/drupal/9.x
-			# (07/2020) current could also be used for 8.9, 9.x
+			# there is no https://updates.drupal.org/release-history/drupal/10.x
+			# (12/2023) current can be used for 10.x: "<supported_branches>10.0.,10.1.,10.2.</supported_branches>"
 			drupalRelease='current'
 			;;
 	esac
@@ -89,8 +89,11 @@ for version in "${versions[@]}"; do
 					version: env.fullVersion,
 					phpVersions: (
 						[
+							# https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps
+							# Drupal now supports PHP 8.3 and recommends at least PHP 8.2.
+							if [ "7", "10.0", "10.1" ] | index(env.version) then empty else "8.3" end,
 							"8.2",
-							"8.1",
+							if [ "7", "10.0", "10.1" ] | index(env.version) then "8.1" else empty end,
 							# https://www.drupal.org/docs/system-requirements/php-requirements
 							# https://www.drupal.org/docs/7/system-requirements/php-requirements
 							empty