Merge pull request #240 from infosiftr/alpine3.18

Update to Alpine 3.18

apply-templates.sh

@@ -43,7 +43,10 @@ for version; do
 		for variant in "${variants[@]}"; do
 			export variant
 
-			# https://github.com/docker-library/php/blob/d4616116cbeda0937d08ef89ef27b67c5156befd/versions.sh#L93-L96
+			# https://github.com/docker-library/php/blob/0a68eaa2d3a269079c687e55abc960c77d3a134e/versions.sh#L94-L101
+			if [[ "$variant" = *-'alpine3.16' ]] && [ "$phpVersion" != '8.0' ]; then
+				continue
+			fi
 			if [ "$phpVersion" = '8.0' ] && [[ "$variant" = *-alpine* ]] && [[ "$variant" != *-'alpine3.16' ]]; then
 				continue
 			fi

versions.json

@@ -12,8 +12,8 @@
       "fpm-bullseye",
       "apache-buster",
       "fpm-buster",
-      "fpm-alpine3.17",
-      "fpm-alpine3.16"
+      "fpm-alpine3.18",
+      "fpm-alpine3.17"
     ],
     "version": "10.0.9"
   },
@@ -27,6 +27,7 @@
       "fpm-bullseye",
       "apache-buster",
       "fpm-buster",
+      "fpm-alpine3.18",
       "fpm-alpine3.17",
       "fpm-alpine3.16"
     ],
@@ -45,6 +46,7 @@
       "fpm-bullseye",
       "apache-buster",
       "fpm-buster",
+      "fpm-alpine3.18",
       "fpm-alpine3.17",
       "fpm-alpine3.16"
     ],
@@ -63,6 +65,7 @@
       "fpm-bullseye",
       "apache-buster",
       "fpm-buster",
+      "fpm-alpine3.18",
       "fpm-alpine3.17",
       "fpm-alpine3.16"
     ],

versions.sh

@@ -84,30 +84,34 @@ for version in "${versions[@]}"; do
 	export fullVersion
 	json="$(
 		jq <<<"$json" -c --argjson doc "$doc" '
-			.[env.version] = {
-				version: env.fullVersion,
-				variants: [
+			.[env.version] = (
+				{
+					version: env.fullVersion,
+					phpVersions: (
+						# https://www.drupal.org/docs/system-requirements/php-requirements
+						# https://www.drupal.org/docs/7/system-requirements/php-requirements
+						if env.version == "7" then
+							[ "8.0" ]
+						elif env.version | startswith("9.") then
+							[ "8.1", "8.0" ]
+						else
+							# https://www.drupal.org/node/3264830
+							# Require PHP 8.1 for Drupal 10
+							[ "8.2", "8.1" ]
+						end
+					),
+				} + $doc
+				| .variants = [
 					"bullseye",
 					"buster",
+					"alpine3.18",
 					"alpine3.17",
-					"alpine3.16"
+					if .phpVersions | index("8.0") then "alpine3.16" else empty end, # https://github.com/docker-library/php/blob/0a68eaa2d3a269079c687e55abc960c77d3a134e/versions.sh#L94-L101
+					empty
 					| if startswith("alpine") then empty else "apache-" + . end,
 						"fpm-" + .
-				],
-				phpVersions: (
-					# https://www.drupal.org/docs/system-requirements/php-requirements
-					# https://www.drupal.org/docs/7/system-requirements/php-requirements
-					if env.version == "7" then
-						[ "8.0" ]
-					elif env.version | startswith("9.") then
-						[ "8.1", "8.0" ]
-					else
-						# https://www.drupal.org/node/3264830
-						# Require PHP 8.1 for Drupal 10
-						[ "8.2", "8.1" ]
-					end
-				),
-			} + $doc
+				]
+			)
 		'
 	)"
 done