Merge pull request #1405 from jnoordsij/add-alpine-3.18

Add Alpine 3.18 variant

8.1-rc/alpine3.18/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.1-rc/alpine3.18/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.1-rc/alpine3.18/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.1/alpine3.18/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.1/alpine3.18/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.1/alpine3.18/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.2-rc/alpine3.18/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.2-rc/alpine3.18/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.2-rc/alpine3.18/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.2/alpine3.18/cli/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.2/alpine3.18/fpm/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

8.2/alpine3.18/zts/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)

versions.json

@@ -32,12 +32,12 @@
       "buster/apache",
       "buster/fpm",
       "buster/zts",
+      "alpine3.18/cli",
+      "alpine3.18/fpm",
+      "alpine3.18/zts",
       "alpine3.17/cli",
       "alpine3.17/fpm",
-      "alpine3.17/zts",
+      "alpine3.17/zts"
-      "alpine3.16/cli",
-      "alpine3.16/fpm",
-      "alpine3.16/zts"
     ],
     "version": "8.1.18"
   },
@@ -54,12 +54,12 @@
       "buster/apache",
       "buster/fpm",
       "buster/zts",
+      "alpine3.18/cli",
+      "alpine3.18/fpm",
+      "alpine3.18/zts",
       "alpine3.17/cli",
       "alpine3.17/fpm",
-      "alpine3.17/zts",
+      "alpine3.17/zts"
-      "alpine3.16/cli",
-      "alpine3.16/fpm",
-      "alpine3.16/zts"
     ],
     "version": "8.1.19RC1"
   },
@@ -76,12 +76,12 @@
       "buster/apache",
       "buster/fpm",
       "buster/zts",
+      "alpine3.18/cli",
+      "alpine3.18/fpm",
+      "alpine3.18/zts",
       "alpine3.17/cli",
       "alpine3.17/fpm",
-      "alpine3.17/zts",
+      "alpine3.17/zts"
-      "alpine3.16/cli",
-      "alpine3.16/fpm",
-      "alpine3.16/zts"
     ],
     "version": "8.2.5"
   },
@@ -98,12 +98,12 @@
       "buster/apache",
       "buster/fpm",
       "buster/zts",
+      "alpine3.18/cli",
+      "alpine3.18/fpm",
+      "alpine3.18/zts",
       "alpine3.17/cli",
       "alpine3.17/fpm",
-      "alpine3.17/zts",
+      "alpine3.17/zts"
-      "alpine3.16/cli",
-      "alpine3.16/fpm",
-      "alpine3.16/zts"
     ],
     "version": "8.2.6RC1"
   }

versions.sh

@@ -87,6 +87,7 @@ for version in "${versions[@]}"; do
 	for suite in \
 		bullseye \
 		buster \
+		alpine3.18 \
 		alpine3.17 \
 		alpine3.16 \
 	; do
@@ -94,6 +95,10 @@ for version in "${versions[@]}"; do
 		if [ "$rcVersion" = '8.0' ] && [[ "$suite" = alpine* ]] && [ "$suite" != 'alpine3.16' ]; then
 			continue
 		fi
+		# https://github.com/docker-library/php/pull/1405
+		if [ "$suite" = 'alpine3.16' ] && [ "$rcVersion" != '8.0' ]; then
+			continue
+		fi
 		for variant in cli apache fpm zts; do
 			if [[ "$suite" = alpine* ]]; then
 				if [ "$variant" = 'apache' ]; then