Update php #13622

tianon · 2022-11-30T19:26:51Z

Changes:

docker-library/php@d461611: Add Alpine 3.17 variant (Add Alpine 3.17 variant php#1348)
docker-library/php@2a7223d: Merge pull request Remove PHP 7.4 php#1349 from jnoordsij/remove-7.4

Changes: - docker-library/php@d461611: Add Alpine 3.17 variant (docker-library/php#1348) - docker-library/php@2a7223d: Merge pull request docker-library/php#1349 from jnoordsij/remove-7.4

github-actions · 2022-11-30T19:49:25Z

Diff for 14bc597:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8f16d8d..951b65e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,76 +1,6 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/php.git
 
-Tags: 7.4.33-apache-bullseye, 7.4-apache-bullseye, 7-apache-bullseye, 7.4.33-apache, 7.4-apache, 7-apache
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/bullseye/apache
-
-Tags: 7.4.33-apache-buster, 7.4-apache-buster, 7-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/buster/apache
-
-Tags: 7.4.33-cli-alpine3.15, 7.4-cli-alpine3.15, 7-cli-alpine3.15, 7.4.33-alpine3.15, 7.4-alpine3.15, 7-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/alpine3.15/cli
-
-Tags: 7.4.33-cli-alpine3.16, 7.4-cli-alpine3.16, 7-cli-alpine3.16, 7.4.33-alpine3.16, 7.4-alpine3.16, 7-alpine3.16, 7.4.33-cli-alpine, 7.4-cli-alpine, 7-cli-alpine, 7.4.33-alpine, 7.4-alpine, 7-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/alpine3.16/cli
-
-Tags: 7.4.33-cli-bullseye, 7.4-cli-bullseye, 7-cli-bullseye, 7.4.33-bullseye, 7.4-bullseye, 7-bullseye, 7.4.33-cli, 7.4-cli, 7-cli, 7.4.33, 7.4, 7
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/bullseye/cli
-
-Tags: 7.4.33-cli-buster, 7.4-cli-buster, 7-cli-buster, 7.4.33-buster, 7.4-buster, 7-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/buster/cli
-
-Tags: 7.4.33-fpm-alpine3.15, 7.4-fpm-alpine3.15, 7-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/alpine3.15/fpm
-
-Tags: 7.4.33-fpm-alpine3.16, 7.4-fpm-alpine3.16, 7-fpm-alpine3.16, 7.4.33-fpm-alpine, 7.4-fpm-alpine, 7-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/alpine3.16/fpm
-
-Tags: 7.4.33-fpm-bullseye, 7.4-fpm-bullseye, 7-fpm-bullseye, 7.4.33-fpm, 7.4-fpm, 7-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/bullseye/fpm
-
-Tags: 7.4.33-fpm-buster, 7.4-fpm-buster, 7-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/buster/fpm
-
-Tags: 7.4.33-zts-alpine3.15, 7.4-zts-alpine3.15, 7-zts-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7894e0343ab4adc6e0e101e13b2363615f4143f8
-Directory: 7.4/alpine3.15/zts
-
-Tags: 7.4.33-zts-alpine3.16, 7.4-zts-alpine3.16, 7-zts-alpine3.16, 7.4.33-zts-alpine, 7.4-zts-alpine, 7-zts-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7894e0343ab4adc6e0e101e13b2363615f4143f8
-Directory: 7.4/alpine3.16/zts
-
-Tags: 7.4.33-zts-bullseye, 7.4-zts-bullseye, 7-zts-bullseye, 7.4.33-zts, 7.4-zts, 7-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/bullseye/zts
-
-Tags: 7.4.33-zts-buster, 7.4-zts-buster, 7-zts-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b9f17156020c3aef71df681b27684533529347a7
-Directory: 7.4/buster/zts
-
 Tags: 8.0.26-apache-bullseye, 8.0-apache-bullseye, 8.0.26-apache, 8.0-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
@@ -81,11 +11,6 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
 Directory: 8.0/buster/apache
 
-Tags: 8.0.26-cli-alpine3.15, 8.0-cli-alpine3.15, 8.0.26-alpine3.15, 8.0-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: de42084f6fd186434a829eda2b79b0849849f791
-Directory: 8.0/alpine3.15/cli
-
 Tags: 8.0.26-cli-alpine3.16, 8.0-cli-alpine3.16, 8.0.26-alpine3.16, 8.0-alpine3.16, 8.0.26-cli-alpine, 8.0-cli-alpine, 8.0.26-alpine, 8.0-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
@@ -101,11 +26,6 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
 Directory: 8.0/buster/cli
 
-Tags: 8.0.26-fpm-alpine3.15, 8.0-fpm-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: de42084f6fd186434a829eda2b79b0849849f791
-Directory: 8.0/alpine3.15/fpm
-
 Tags: 8.0.26-fpm-alpine3.16, 8.0-fpm-alpine3.16, 8.0.26-fpm-alpine, 8.0-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
@@ -121,11 +41,6 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
 Directory: 8.0/buster/fpm
 
-Tags: 8.0.26-zts-alpine3.15, 8.0-zts-alpine3.15
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: de42084f6fd186434a829eda2b79b0849849f791
-Directory: 8.0/alpine3.15/zts
-
 Tags: 8.0.26-zts-alpine3.16, 8.0-zts-alpine3.16, 8.0.26-zts-alpine, 8.0-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: de42084f6fd186434a829eda2b79b0849849f791
@@ -151,15 +66,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
 Directory: 8.1/buster/apache
 
-Tags: 8.1.13-cli-alpine3.15, 8.1-cli-alpine3.15, 8-cli-alpine3.15, cli-alpine3.15, 8.1.13-alpine3.15, 8.1-alpine3.15, 8-alpine3.15, alpine3.15
+Tags: 8.1.13-cli-alpine3.16, 8.1-cli-alpine3.16, 8-cli-alpine3.16, cli-alpine3.16, 8.1.13-alpine3.16, 8.1-alpine3.16, 8-alpine3.16, alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
-Directory: 8.1/alpine3.15/cli
+Directory: 8.1/alpine3.16/cli
 
-Tags: 8.1.13-cli-alpine3.16, 8.1-cli-alpine3.16, 8-cli-alpine3.16, cli-alpine3.16, 8.1.13-alpine3.16, 8.1-alpine3.16, 8-alpine3.16, alpine3.16, 8.1.13-cli-alpine, 8.1-cli-alpine, 8-cli-alpine, cli-alpine, 8.1.13-alpine, 8.1-alpine, 8-alpine, alpine
+Tags: 8.1.13-cli-alpine3.17, 8.1-cli-alpine3.17, 8-cli-alpine3.17, cli-alpine3.17, 8.1.13-alpine3.17, 8.1-alpine3.17, 8-alpine3.17, alpine3.17, 8.1.13-cli-alpine, 8.1-cli-alpine, 8-cli-alpine, cli-alpine, 8.1.13-alpine, 8.1-alpine, 8-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
-Directory: 8.1/alpine3.16/cli
+GitCommit: d4616116cbeda0937d08ef89ef27b67c5156befd
+Directory: 8.1/alpine3.17/cli
 
 Tags: 8.1.13-cli-bullseye, 8.1-cli-bullseye, 8-cli-bullseye, cli-bullseye, 8.1.13-bullseye, 8.1-bullseye, 8-bullseye, bullseye, 8.1.13-cli, 8.1-cli, 8-cli, cli, 8.1.13, 8.1, 8, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -171,15 +86,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
 Directory: 8.1/buster/cli
 
-Tags: 8.1.13-fpm-alpine3.15, 8.1-fpm-alpine3.15, 8-fpm-alpine3.15, fpm-alpine3.15
+Tags: 8.1.13-fpm-alpine3.16, 8.1-fpm-alpine3.16, 8-fpm-alpine3.16, fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
-Directory: 8.1/alpine3.15/fpm
+Directory: 8.1/alpine3.16/fpm
 
-Tags: 8.1.13-fpm-alpine3.16, 8.1-fpm-alpine3.16, 8-fpm-alpine3.16, fpm-alpine3.16, 8.1.13-fpm-alpine, 8.1-fpm-alpine, 8-fpm-alpine, fpm-alpine
+Tags: 8.1.13-fpm-alpine3.17, 8.1-fpm-alpine3.17, 8-fpm-alpine3.17, fpm-alpine3.17, 8.1.13-fpm-alpine, 8.1-fpm-alpine, 8-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
-Directory: 8.1/alpine3.16/fpm
+GitCommit: d4616116cbeda0937d08ef89ef27b67c5156befd
+Directory: 8.1/alpine3.17/fpm
 
 Tags: 8.1.13-fpm-bullseye, 8.1-fpm-bullseye, 8-fpm-bullseye, fpm-bullseye, 8.1.13-fpm, 8.1-fpm, 8-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -191,15 +106,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
 Directory: 8.1/buster/fpm
 
-Tags: 8.1.13-zts-alpine3.15, 8.1-zts-alpine3.15, 8-zts-alpine3.15, zts-alpine3.15
+Tags: 8.1.13-zts-alpine3.16, 8.1-zts-alpine3.16, 8-zts-alpine3.16, zts-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
-Directory: 8.1/alpine3.15/zts
+Directory: 8.1/alpine3.16/zts
 
-Tags: 8.1.13-zts-alpine3.16, 8.1-zts-alpine3.16, 8-zts-alpine3.16, zts-alpine3.16, 8.1.13-zts-alpine, 8.1-zts-alpine, 8-zts-alpine, zts-alpine
+Tags: 8.1.13-zts-alpine3.17, 8.1-zts-alpine3.17, 8-zts-alpine3.17, zts-alpine3.17, 8.1.13-zts-alpine, 8.1-zts-alpine, 8-zts-alpine, zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 91fd88926775a505e17c240619b146d9f96cdf3c
-Directory: 8.1/alpine3.16/zts
+GitCommit: d4616116cbeda0937d08ef89ef27b67c5156befd
+Directory: 8.1/alpine3.17/zts
 
 Tags: 8.1.13-zts-bullseye, 8.1-zts-bullseye, 8-zts-bullseye, zts-bullseye, 8.1.13-zts, 8.1-zts, 8-zts, zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -221,15 +136,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 1361ba95d80570e3984f9de9f765948246191557
 Directory: 8.2-rc/buster/apache
 
-Tags: 8.2.0RC7-cli-alpine3.15, 8.2-rc-cli-alpine3.15, 8.2.0RC7-alpine3.15, 8.2-rc-alpine3.15
+Tags: 8.2.0RC7-cli-alpine3.16, 8.2-rc-cli-alpine3.16, 8.2.0RC7-alpine3.16, 8.2-rc-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1361ba95d80570e3984f9de9f765948246191557
-Directory: 8.2-rc/alpine3.15/cli
+Directory: 8.2-rc/alpine3.16/cli
 
-Tags: 8.2.0RC7-cli-alpine3.16, 8.2-rc-cli-alpine3.16, 8.2.0RC7-alpine3.16, 8.2-rc-alpine3.16, 8.2.0RC7-cli-alpine, 8.2-rc-cli-alpine, 8.2.0RC7-alpine, 8.2-rc-alpine
+Tags: 8.2.0RC7-cli-alpine3.17, 8.2-rc-cli-alpine3.17, 8.2.0RC7-alpine3.17, 8.2-rc-alpine3.17, 8.2.0RC7-cli-alpine, 8.2-rc-cli-alpine, 8.2.0RC7-alpine, 8.2-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1361ba95d80570e3984f9de9f765948246191557
-Directory: 8.2-rc/alpine3.16/cli
+GitCommit: d4616116cbeda0937d08ef89ef27b67c5156befd
+Directory: 8.2-rc/alpine3.17/cli
 
 Tags: 8.2.0RC7-cli-bullseye, 8.2-rc-cli-bullseye, 8.2.0RC7-bullseye, 8.2-rc-bullseye, 8.2.0RC7-cli, 8.2-rc-cli, 8.2.0RC7, 8.2-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -241,15 +156,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 1361ba95d80570e3984f9de9f765948246191557
 Directory: 8.2-rc/buster/cli
 
-Tags: 8.2.0RC7-fpm-alpine3.15, 8.2-rc-fpm-alpine3.15
+Tags: 8.2.0RC7-fpm-alpine3.16, 8.2-rc-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1361ba95d80570e3984f9de9f765948246191557
-Directory: 8.2-rc/alpine3.15/fpm
+Directory: 8.2-rc/alpine3.16/fpm
 
-Tags: 8.2.0RC7-fpm-alpine3.16, 8.2-rc-fpm-alpine3.16, 8.2.0RC7-fpm-alpine, 8.2-rc-fpm-alpine
+Tags: 8.2.0RC7-fpm-alpine3.17, 8.2-rc-fpm-alpine3.17, 8.2.0RC7-fpm-alpine, 8.2-rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1361ba95d80570e3984f9de9f765948246191557
-Directory: 8.2-rc/alpine3.16/fpm
+GitCommit: d4616116cbeda0937d08ef89ef27b67c5156befd
+Directory: 8.2-rc/alpine3.17/fpm
 
 Tags: 8.2.0RC7-fpm-bullseye, 8.2-rc-fpm-bullseye, 8.2.0RC7-fpm, 8.2-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -261,15 +176,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 1361ba95d80570e3984f9de9f765948246191557
 Directory: 8.2-rc/buster/fpm
 
-Tags: 8.2.0RC7-zts-alpine3.15, 8.2-rc-zts-alpine3.15
+Tags: 8.2.0RC7-zts-alpine3.16, 8.2-rc-zts-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1361ba95d80570e3984f9de9f765948246191557
-Directory: 8.2-rc/alpine3.15/zts
+Directory: 8.2-rc/alpine3.16/zts
 
-Tags: 8.2.0RC7-zts-alpine3.16, 8.2-rc-zts-alpine3.16, 8.2.0RC7-zts-alpine, 8.2-rc-zts-alpine
+Tags: 8.2.0RC7-zts-alpine3.17, 8.2-rc-zts-alpine3.17, 8.2.0RC7-zts-alpine, 8.2-rc-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1361ba95d80570e3984f9de9f765948246191557
-Directory: 8.2-rc/alpine3.16/zts
+GitCommit: d4616116cbeda0937d08ef89ef27b67c5156befd
+Directory: 8.2-rc/alpine3.17/zts
 
 Tags: 8.2.0RC7-zts-bullseye, 8.2-rc-zts-bullseye, 8.2.0RC7-zts, 8.2-rc-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 7437877..5f445e2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,88 +1,7 @@
-php:7
-php:7-alpine
-php:7-alpine3.15
-php:7-alpine3.16
-php:7-apache
-php:7-apache-bullseye
-php:7-apache-buster
-php:7-bullseye
-php:7-buster
-php:7-cli
-php:7-cli-alpine
-php:7-cli-alpine3.15
-php:7-cli-alpine3.16
-php:7-cli-bullseye
-php:7-cli-buster
-php:7-fpm
-php:7-fpm-alpine
-php:7-fpm-alpine3.15
-php:7-fpm-alpine3.16
-php:7-fpm-bullseye
-php:7-fpm-buster
-php:7-zts
-php:7-zts-alpine
-php:7-zts-alpine3.15
-php:7-zts-alpine3.16
-php:7-zts-bullseye
-php:7-zts-buster
-php:7.4
-php:7.4-alpine
-php:7.4-alpine3.15
-php:7.4-alpine3.16
-php:7.4-apache
-php:7.4-apache-bullseye
-php:7.4-apache-buster
-php:7.4-bullseye
-php:7.4-buster
-php:7.4-cli
-php:7.4-cli-alpine
-php:7.4-cli-alpine3.15
-php:7.4-cli-alpine3.16
-php:7.4-cli-bullseye
-php:7.4-cli-buster
-php:7.4-fpm
-php:7.4-fpm-alpine
-php:7.4-fpm-alpine3.15
-php:7.4-fpm-alpine3.16
-php:7.4-fpm-bullseye
-php:7.4-fpm-buster
-php:7.4-zts
-php:7.4-zts-alpine
-php:7.4-zts-alpine3.15
-php:7.4-zts-alpine3.16
-php:7.4-zts-bullseye
-php:7.4-zts-buster
-php:7.4.33
-php:7.4.33-alpine
-php:7.4.33-alpine3.15
-php:7.4.33-alpine3.16
-php:7.4.33-apache
-php:7.4.33-apache-bullseye
-php:7.4.33-apache-buster
-php:7.4.33-bullseye
-php:7.4.33-buster
-php:7.4.33-cli
-php:7.4.33-cli-alpine
-php:7.4.33-cli-alpine3.15
-php:7.4.33-cli-alpine3.16
-php:7.4.33-cli-bullseye
-php:7.4.33-cli-buster
-php:7.4.33-fpm
-php:7.4.33-fpm-alpine
-php:7.4.33-fpm-alpine3.15
-php:7.4.33-fpm-alpine3.16
-php:7.4.33-fpm-bullseye
-php:7.4.33-fpm-buster
-php:7.4.33-zts
-php:7.4.33-zts-alpine
-php:7.4.33-zts-alpine3.15
-php:7.4.33-zts-alpine3.16
-php:7.4.33-zts-bullseye
-php:7.4.33-zts-buster
 php:8
 php:8-alpine
-php:8-alpine3.15
 php:8-alpine3.16
+php:8-alpine3.17
 php:8-apache
 php:8-apache-bullseye
 php:8-apache-buster
@@ -90,25 +9,24 @@ php:8-bullseye
 php:8-buster
 php:8-cli
 php:8-cli-alpine
-php:8-cli-alpine3.15
 php:8-cli-alpine3.16
+php:8-cli-alpine3.17
 php:8-cli-bullseye
 php:8-cli-buster
 php:8-fpm
 php:8-fpm-alpine
-php:8-fpm-alpine3.15
 php:8-fpm-alpine3.16
+php:8-fpm-alpine3.17
 php:8-fpm-bullseye
 php:8-fpm-buster
 php:8-zts
 php:8-zts-alpine
-php:8-zts-alpine3.15
 php:8-zts-alpine3.16
+php:8-zts-alpine3.17
 php:8-zts-bullseye
 php:8-zts-buster
 php:8.0
 php:8.0-alpine
-php:8.0-alpine3.15
 php:8.0-alpine3.16
 php:8.0-apache
 php:8.0-apache-bullseye
@@ -117,25 +35,21 @@ php:8.0-bullseye
 php:8.0-buster
 php:8.0-cli
 php:8.0-cli-alpine
-php:8.0-cli-alpine3.15
 php:8.0-cli-alpine3.16
 php:8.0-cli-bullseye
 php:8.0-cli-buster
 php:8.0-fpm
 php:8.0-fpm-alpine
-php:8.0-fpm-alpine3.15
 php:8.0-fpm-alpine3.16
 php:8.0-fpm-bullseye
 php:8.0-fpm-buster
 php:8.0-zts
 php:8.0-zts-alpine
-php:8.0-zts-alpine3.15
 php:8.0-zts-alpine3.16
 php:8.0-zts-bullseye
 php:8.0-zts-buster
 php:8.0.26
 php:8.0.26-alpine
-php:8.0.26-alpine3.15
 php:8.0.26-alpine3.16
 php:8.0.26-apache
 php:8.0.26-apache-bullseye
@@ -144,26 +58,23 @@ php:8.0.26-bullseye
 php:8.0.26-buster
 php:8.0.26-cli
 php:8.0.26-cli-alpine
-php:8.0.26-cli-alpine3.15
 php:8.0.26-cli-alpine3.16
 php:8.0.26-cli-bullseye
 php:8.0.26-cli-buster
 php:8.0.26-fpm
 php:8.0.26-fpm-alpine
-php:8.0.26-fpm-alpine3.15
 php:8.0.26-fpm-alpine3.16
 php:8.0.26-fpm-bullseye
 php:8.0.26-fpm-buster
 php:8.0.26-zts
 php:8.0.26-zts-alpine
-php:8.0.26-zts-alpine3.15
 php:8.0.26-zts-alpine3.16
 php:8.0.26-zts-bullseye
 php:8.0.26-zts-buster
 php:8.1
 php:8.1-alpine
-php:8.1-alpine3.15
 php:8.1-alpine3.16
+php:8.1-alpine3.17
 php:8.1-apache
 php:8.1-apache-bullseye
 php:8.1-apache-buster
@@ -171,26 +82,26 @@ php:8.1-bullseye
 php:8.1-buster
 php:8.1-cli
 php:8.1-cli-alpine
-php:8.1-cli-alpine3.15
 php:8.1-cli-alpine3.16
+php:8.1-cli-alpine3.17
 php:8.1-cli-bullseye
 php:8.1-cli-buster
 php:8.1-fpm
 php:8.1-fpm-alpine
-php:8.1-fpm-alpine3.15
 php:8.1-fpm-alpine3.16
+php:8.1-fpm-alpine3.17
 php:8.1-fpm-bullseye
 php:8.1-fpm-buster
 php:8.1-zts
 php:8.1-zts-alpine
-php:8.1-zts-alpine3.15
 php:8.1-zts-alpine3.16
+php:8.1-zts-alpine3.17
 php:8.1-zts-bullseye
 php:8.1-zts-buster
 php:8.1.13
 php:8.1.13-alpine
-php:8.1.13-alpine3.15
 php:8.1.13-alpine3.16
+php:8.1.13-alpine3.17
 php:8.1.13-apache
 php:8.1.13-apache-bullseye
 php:8.1.13-apache-buster
@@ -198,26 +109,26 @@ php:8.1.13-bullseye
 php:8.1.13-buster
 php:8.1.13-cli
 php:8.1.13-cli-alpine
-php:8.1.13-cli-alpine3.15
 php:8.1.13-cli-alpine3.16
+php:8.1.13-cli-alpine3.17
 php:8.1.13-cli-bullseye
 php:8.1.13-cli-buster
 php:8.1.13-fpm
 php:8.1.13-fpm-alpine
-php:8.1.13-fpm-alpine3.15
 php:8.1.13-fpm-alpine3.16
+php:8.1.13-fpm-alpine3.17
 php:8.1.13-fpm-bullseye
 php:8.1.13-fpm-buster
 php:8.1.13-zts
 php:8.1.13-zts-alpine
-php:8.1.13-zts-alpine3.15
 php:8.1.13-zts-alpine3.16
+php:8.1.13-zts-alpine3.17
 php:8.1.13-zts-bullseye
 php:8.1.13-zts-buster
 php:8.2-rc
 php:8.2-rc-alpine
-php:8.2-rc-alpine3.15
 php:8.2-rc-alpine3.16
+php:8.2-rc-alpine3.17
 php:8.2-rc-apache
 php:8.2-rc-apache-bullseye
 php:8.2-rc-apache-buster
@@ -225,26 +136,26 @@ php:8.2-rc-bullseye
 php:8.2-rc-buster
 php:8.2-rc-cli
 php:8.2-rc-cli-alpine
-php:8.2-rc-cli-alpine3.15
 php:8.2-rc-cli-alpine3.16
+php:8.2-rc-cli-alpine3.17
 php:8.2-rc-cli-bullseye
 php:8.2-rc-cli-buster
 php:8.2-rc-fpm
 php:8.2-rc-fpm-alpine
-php:8.2-rc-fpm-alpine3.15
 php:8.2-rc-fpm-alpine3.16
+php:8.2-rc-fpm-alpine3.17
 php:8.2-rc-fpm-bullseye
 php:8.2-rc-fpm-buster
 php:8.2-rc-zts
 php:8.2-rc-zts-alpine
-php:8.2-rc-zts-alpine3.15
 php:8.2-rc-zts-alpine3.16
+php:8.2-rc-zts-alpine3.17
 php:8.2-rc-zts-bullseye
 php:8.2-rc-zts-buster
 php:8.2.0RC7
 php:8.2.0RC7-alpine
-php:8.2.0RC7-alpine3.15
 php:8.2.0RC7-alpine3.16
+php:8.2.0RC7-alpine3.17
 php:8.2.0RC7-apache
 php:8.2.0RC7-apache-bullseye
 php:8.2.0RC7-apache-buster
@@ -252,25 +163,25 @@ php:8.2.0RC7-bullseye
 php:8.2.0RC7-buster
 php:8.2.0RC7-cli
 php:8.2.0RC7-cli-alpine
-php:8.2.0RC7-cli-alpine3.15
 php:8.2.0RC7-cli-alpine3.16
+php:8.2.0RC7-cli-alpine3.17
 php:8.2.0RC7-cli-bullseye
 php:8.2.0RC7-cli-buster
 php:8.2.0RC7-fpm
 php:8.2.0RC7-fpm-alpine
-php:8.2.0RC7-fpm-alpine3.15
 php:8.2.0RC7-fpm-alpine3.16
+php:8.2.0RC7-fpm-alpine3.17
 php:8.2.0RC7-fpm-bullseye
 php:8.2.0RC7-fpm-buster
 php:8.2.0RC7-zts
 php:8.2.0RC7-zts-alpine
-php:8.2.0RC7-zts-alpine3.15
 php:8.2.0RC7-zts-alpine3.16
+php:8.2.0RC7-zts-alpine3.17
 php:8.2.0RC7-zts-bullseye
 php:8.2.0RC7-zts-buster
 php:alpine
-php:alpine3.15
 php:alpine3.16
+php:alpine3.17
 php:apache
 php:apache-bullseye
 php:apache-buster
@@ -278,20 +189,20 @@ php:bullseye
 php:buster
 php:cli
 php:cli-alpine
-php:cli-alpine3.15
 php:cli-alpine3.16
+php:cli-alpine3.17
 php:cli-bullseye
 php:cli-buster
 php:fpm
 php:fpm-alpine
-php:fpm-alpine3.15
 php:fpm-alpine3.16
+php:fpm-alpine3.17
 php:fpm-bullseye
 php:fpm-buster
 php:latest
 php:zts
 php:zts-alpine
-php:zts-alpine3.15
 php:zts-alpine3.16
+php:zts-alpine3.17
 php:zts-bullseye
 php:zts-buster
diff --git a/php_7-alpine/Dockerfile b/php_7-alpine/Dockerfile
deleted file mode 100644
index b1192fe..0000000
diff --git a/php_7-alpine3.15/Dockerfile b/php_7-alpine3.15/Dockerfile
deleted file mode 100644
index db3395c..0000000
diff --git a/php_7-apache-buster/Dockerfile b/php_7-apache-buster/Dockerfile
deleted file mode 100644
index e9b2850..0000000
diff --git a/php_7-apache-buster/apache2-foreground b/php_7-apache-buster/apache2-foreground
deleted file mode 100755
index 5fe22e2..0000000
diff --git a/php_7-apache-buster/docker-php-entrypoint b/php_7-apache-buster/docker-php-entrypoint
deleted file mode 100755
index 3d36d5e..0000000
diff --git a/php_7-apache/Dockerfile b/php_7-apache/Dockerfile
deleted file mode 100644
index 327725b..0000000
diff --git a/php_7-apache/apache2-foreground b/php_7-apache/apache2-foreground
deleted file mode 100755
index 5fe22e2..0000000
diff --git a/php_7-apache/docker-php-entrypoint b/php_7-apache/docker-php-entrypoint
deleted file mode 100755
index 3d36d5e..0000000
diff --git a/php_7-buster/Dockerfile b/php_7-buster/Dockerfile
deleted file mode 100644
index 5903e9f..0000000
diff --git a/php_7-fpm-alpine/Dockerfile b/php_7-fpm-alpine/Dockerfile
deleted file mode 100644
index 661c0c5..0000000
diff --git a/php_7-fpm-alpine3.15/Dockerfile b/php_7-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index 60ed912..0000000
diff --git a/php_7-fpm-alpine3.15/docker-php-ext-configure b/php_7-fpm-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-fpm-alpine3.15/docker-php-ext-enable b/php_7-fpm-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-fpm-alpine3.15/docker-php-ext-install b/php_7-fpm-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-fpm-alpine3.15/docker-php-source b/php_7-fpm-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7-fpm-buster/Dockerfile b/php_7-fpm-buster/Dockerfile
deleted file mode 100644
index c548e7e..0000000
diff --git a/php_7-fpm-buster/docker-php-entrypoint b/php_7-fpm-buster/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_7-fpm-buster/docker-php-ext-configure b/php_7-fpm-buster/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-fpm-buster/docker-php-ext-enable b/php_7-fpm-buster/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-fpm-buster/docker-php-ext-install b/php_7-fpm-buster/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-fpm-buster/docker-php-source b/php_7-fpm-buster/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7-fpm/Dockerfile b/php_7-fpm/Dockerfile
deleted file mode 100644
index 112e093..0000000
diff --git a/php_7-fpm/docker-php-entrypoint b/php_7-fpm/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_7-fpm/docker-php-ext-configure b/php_7-fpm/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-fpm/docker-php-ext-enable b/php_7-fpm/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-fpm/docker-php-ext-install b/php_7-fpm/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-fpm/docker-php-source b/php_7-fpm/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7-zts-alpine/Dockerfile b/php_7-zts-alpine/Dockerfile
deleted file mode 100644
index 2d63b6b..0000000
diff --git a/php_7-zts-alpine/docker-php-ext-configure b/php_7-zts-alpine/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-zts-alpine/docker-php-ext-enable b/php_7-zts-alpine/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-zts-alpine/docker-php-ext-install b/php_7-zts-alpine/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-zts-alpine/docker-php-source b/php_7-zts-alpine/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7-zts-alpine3.15/Dockerfile b/php_7-zts-alpine3.15/Dockerfile
deleted file mode 100644
index e013c65..0000000
diff --git a/php_7-zts-alpine3.15/docker-php-entrypoint b/php_7-zts-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_7-zts-alpine3.15/docker-php-ext-configure b/php_7-zts-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-zts-alpine3.15/docker-php-ext-enable b/php_7-zts-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-zts-alpine3.15/docker-php-ext-install b/php_7-zts-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-zts-alpine3.15/docker-php-source b/php_7-zts-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7-zts-buster/Dockerfile b/php_7-zts-buster/Dockerfile
deleted file mode 100644
index b5784aa..0000000
diff --git a/php_7-zts-buster/docker-php-entrypoint b/php_7-zts-buster/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_7-zts-buster/docker-php-ext-configure b/php_7-zts-buster/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-zts-buster/docker-php-ext-enable b/php_7-zts-buster/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-zts-buster/docker-php-ext-install b/php_7-zts-buster/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-zts-buster/docker-php-source b/php_7-zts-buster/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7-zts/Dockerfile b/php_7-zts/Dockerfile
deleted file mode 100644
index 44e9bbc..0000000
diff --git a/php_7-zts/docker-php-entrypoint b/php_7-zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_7-zts/docker-php-ext-configure b/php_7-zts/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7-zts/docker-php-ext-enable b/php_7-zts/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7-zts/docker-php-ext-install b/php_7-zts/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7-zts/docker-php-source b/php_7-zts/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_7/Dockerfile b/php_7/Dockerfile
deleted file mode 100644
index eee6699..0000000
diff --git a/php_7/docker-php-entrypoint b/php_7/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_7/docker-php-ext-configure b/php_7/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_7/docker-php-ext-enable b/php_7/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_7/docker-php-ext-install b/php_7/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_7/docker-php-source b/php_7/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-alpine3.15/Dockerfile b/php_8.0-alpine3.15/Dockerfile
deleted file mode 100644
index bc36f83..0000000
diff --git a/php_8.0-alpine3.15/docker-php-entrypoint b/php_8.0-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-alpine3.15/docker-php-ext-configure b/php_8.0-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-alpine3.15/docker-php-ext-enable b/php_8.0-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-alpine3.15/docker-php-ext-install b/php_8.0-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-alpine3.15/docker-php-source b/php_8.0-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-fpm-alpine3.15/Dockerfile b/php_8.0-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index f90f521..0000000
diff --git a/php_8.0-fpm-alpine3.15/docker-php-entrypoint b/php_8.0-fpm-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_8.0-fpm-alpine3.15/docker-php-ext-configure b/php_8.0-fpm-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-fpm-alpine3.15/docker-php-ext-enable b/php_8.0-fpm-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-fpm-alpine3.15/docker-php-ext-install b/php_8.0-fpm-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-fpm-alpine3.15/docker-php-source b/php_8.0-fpm-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-zts-alpine3.15/Dockerfile b/php_8.0-zts-alpine3.15/Dockerfile
deleted file mode 100644
index 1c9bd93..0000000
diff --git a/php_8.0-zts-alpine3.15/docker-php-entrypoint b/php_8.0-zts-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-zts-alpine3.15/docker-php-ext-configure b/php_8.0-zts-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-zts-alpine3.15/docker-php-ext-enable b/php_8.0-zts-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-zts-alpine3.15/docker-php-ext-install b/php_8.0-zts-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-zts-alpine3.15/docker-php-source b/php_8.0-zts-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.2-rc-alpine/Dockerfile b/php_8.2-rc-alpine/Dockerfile
index e586c96..e412113 100644
--- a/php_8.2-rc-alpine/Dockerfile
+++ b/php_8.2-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-rc-alpine3.15/Dockerfile b/php_8.2-rc-alpine3.15/Dockerfile
deleted file mode 100644
index 4fc6587..0000000
diff --git a/php_8.2-rc-alpine3.15/docker-php-entrypoint b/php_8.2-rc-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.2-rc-alpine3.15/docker-php-ext-configure b/php_8.2-rc-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.2-rc-alpine3.15/docker-php-ext-enable b/php_8.2-rc-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.2-rc-alpine3.15/docker-php-ext-install b/php_8.2-rc-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.2-rc-alpine3.15/docker-php-source b/php_8.2-rc-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.2-rc-alpine/Dockerfile b/php_8.2-rc-alpine3.16/Dockerfile
similarity index 100%
copy from php_8.2-rc-alpine/Dockerfile
copy to php_8.2-rc-alpine3.16/Dockerfile
diff --git a/php_7-alpine/docker-php-entrypoint b/php_8.2-rc-alpine3.16/docker-php-entrypoint
similarity index 100%
rename from php_7-alpine/docker-php-entrypoint
rename to php_8.2-rc-alpine3.16/docker-php-entrypoint
diff --git a/php_7-alpine/docker-php-ext-configure b/php_8.2-rc-alpine3.16/docker-php-ext-configure
similarity index 100%
rename from php_7-alpine/docker-php-ext-configure
rename to php_8.2-rc-alpine3.16/docker-php-ext-configure
diff --git a/php_7-alpine/docker-php-ext-enable b/php_8.2-rc-alpine3.16/docker-php-ext-enable
similarity index 100%
rename from php_7-alpine/docker-php-ext-enable
rename to php_8.2-rc-alpine3.16/docker-php-ext-enable
diff --git a/php_7-alpine/docker-php-ext-install b/php_8.2-rc-alpine3.16/docker-php-ext-install
similarity index 100%
rename from php_7-alpine/docker-php-ext-install
rename to php_8.2-rc-alpine3.16/docker-php-ext-install
diff --git a/php_7-alpine/docker-php-source b/php_8.2-rc-alpine3.16/docker-php-source
similarity index 100%
rename from php_7-alpine/docker-php-source
rename to php_8.2-rc-alpine3.16/docker-php-source
diff --git a/php_8.2-rc-fpm-alpine/Dockerfile b/php_8.2-rc-fpm-alpine/Dockerfile
index 5b8b766..82bf715 100644
--- a/php_8.2-rc-fpm-alpine/Dockerfile
+++ b/php_8.2-rc-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-rc-fpm-alpine3.15/Dockerfile b/php_8.2-rc-fpm-alpine3.15/Dockerfile
deleted file mode 100644
index ce8f3d0..0000000
diff --git a/php_8.2-rc-fpm-alpine3.15/docker-php-entrypoint b/php_8.2-rc-fpm-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_8.2-rc-fpm-alpine3.15/docker-php-ext-configure b/php_8.2-rc-fpm-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.2-rc-fpm-alpine3.15/docker-php-ext-enable b/php_8.2-rc-fpm-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.2-rc-fpm-alpine3.15/docker-php-ext-install b/php_8.2-rc-fpm-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.2-rc-fpm-alpine3.15/docker-php-source b/php_8.2-rc-fpm-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.2-rc-fpm-alpine/Dockerfile b/php_8.2-rc-fpm-alpine3.16/Dockerfile
similarity index 100%
copy from php_8.2-rc-fpm-alpine/Dockerfile
copy to php_8.2-rc-fpm-alpine3.16/Dockerfile
diff --git a/php_7-fpm-alpine/docker-php-entrypoint b/php_8.2-rc-fpm-alpine3.16/docker-php-entrypoint
similarity index 100%
rename from php_7-fpm-alpine/docker-php-entrypoint
rename to php_8.2-rc-fpm-alpine3.16/docker-php-entrypoint
diff --git a/php_7-alpine3.15/docker-php-ext-configure b/php_8.2-rc-fpm-alpine3.16/docker-php-ext-configure
similarity index 100%
rename from php_7-alpine3.15/docker-php-ext-configure
rename to php_8.2-rc-fpm-alpine3.16/docker-php-ext-configure
diff --git a/php_7-alpine3.15/docker-php-ext-enable b/php_8.2-rc-fpm-alpine3.16/docker-php-ext-enable
similarity index 100%
rename from php_7-alpine3.15/docker-php-ext-enable
rename to php_8.2-rc-fpm-alpine3.16/docker-php-ext-enable
diff --git a/php_7-alpine3.15/docker-php-ext-install b/php_8.2-rc-fpm-alpine3.16/docker-php-ext-install
similarity index 100%
rename from php_7-alpine3.15/docker-php-ext-install
rename to php_8.2-rc-fpm-alpine3.16/docker-php-ext-install
diff --git a/php_7-alpine3.15/docker-php-source b/php_8.2-rc-fpm-alpine3.16/docker-php-source
similarity index 100%
rename from php_7-alpine3.15/docker-php-source
rename to php_8.2-rc-fpm-alpine3.16/docker-php-source
diff --git a/php_8.2-rc-zts-alpine/Dockerfile b/php_8.2-rc-zts-alpine/Dockerfile
index d7af865..3d44ab5 100644
--- a/php_8.2-rc-zts-alpine/Dockerfile
+++ b/php_8.2-rc-zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_8.2-rc-zts-alpine3.15/Dockerfile b/php_8.2-rc-zts-alpine3.15/Dockerfile
deleted file mode 100644
index a026ce1..0000000
diff --git a/php_8.2-rc-zts-alpine3.15/docker-php-entrypoint b/php_8.2-rc-zts-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.2-rc-zts-alpine3.15/docker-php-ext-configure b/php_8.2-rc-zts-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.2-rc-zts-alpine3.15/docker-php-ext-enable b/php_8.2-rc-zts-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.2-rc-zts-alpine3.15/docker-php-ext-install b/php_8.2-rc-zts-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.2-rc-zts-alpine3.15/docker-php-source b/php_8.2-rc-zts-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.2-rc-zts-alpine/Dockerfile b/php_8.2-rc-zts-alpine3.16/Dockerfile
similarity index 100%
copy from php_8.2-rc-zts-alpine/Dockerfile
copy to php_8.2-rc-zts-alpine3.16/Dockerfile
diff --git a/php_7-alpine3.15/docker-php-entrypoint b/php_8.2-rc-zts-alpine3.16/docker-php-entrypoint
similarity index 100%
rename from php_7-alpine3.15/docker-php-entrypoint
rename to php_8.2-rc-zts-alpine3.16/docker-php-entrypoint
diff --git a/php_7-apache-buster/docker-php-ext-configure b/php_8.2-rc-zts-alpine3.16/docker-php-ext-configure
similarity index 100%
rename from php_7-apache-buster/docker-php-ext-configure
rename to php_8.2-rc-zts-alpine3.16/docker-php-ext-configure
diff --git a/php_7-apache-buster/docker-php-ext-enable b/php_8.2-rc-zts-alpine3.16/docker-php-ext-enable
similarity index 100%
rename from php_7-apache-buster/docker-php-ext-enable
rename to php_8.2-rc-zts-alpine3.16/docker-php-ext-enable
diff --git a/php_7-apache-buster/docker-php-ext-install b/php_8.2-rc-zts-alpine3.16/docker-php-ext-install
similarity index 100%
rename from php_7-apache-buster/docker-php-ext-install
rename to php_8.2-rc-zts-alpine3.16/docker-php-ext-install
diff --git a/php_7-apache-buster/docker-php-source b/php_8.2-rc-zts-alpine3.16/docker-php-source
similarity index 100%
rename from php_7-apache-buster/docker-php-source
rename to php_8.2-rc-zts-alpine3.16/docker-php-source
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index 5c009d5..ce7dc8f 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_alpine3.15/Dockerfile b/php_alpine3.15/Dockerfile
deleted file mode 100644
index 8c91a25..0000000
diff --git a/php_alpine3.15/docker-php-entrypoint b/php_alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_alpine3.15/docker-php-ext-configure b/php_alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_alpine3.15/docker-php-ext-enable b/php_alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_alpine3.15/docker-php-ext-install b/php_alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_alpine3.15/docker-php-source b/php_alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_alpine/Dockerfile b/php_alpine3.16/Dockerfile
similarity index 100%
copy from php_alpine/Dockerfile
copy to php_alpine3.16/Dockerfile
diff --git a/php_7-buster/docker-php-entrypoint b/php_alpine3.16/docker-php-entrypoint
similarity index 100%
rename from php_7-buster/docker-php-entrypoint
rename to php_alpine3.16/docker-php-entrypoint
diff --git a/php_7-apache/docker-php-ext-configure b/php_alpine3.16/docker-php-ext-configure
similarity index 100%
rename from php_7-apache/docker-php-ext-configure
rename to php_alpine3.16/docker-php-ext-configure
diff --git a/php_7-apache/docker-php-ext-enable b/php_alpine3.16/docker-php-ext-enable
similarity index 100%
rename from php_7-apache/docker-php-ext-enable
rename to php_alpine3.16/docker-php-ext-enable
diff --git a/php_7-apache/docker-php-ext-install b/php_alpine3.16/docker-php-ext-install
similarity index 100%
rename from php_7-apache/docker-php-ext-install
rename to php_alpine3.16/docker-php-ext-install
diff --git a/php_7-apache/docker-php-source b/php_alpine3.16/docker-php-source
similarity index 100%
rename from php_7-apache/docker-php-source
rename to php_alpine3.16/docker-php-source
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index 9c9b81a..c6b4035 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_fpm-alpine3.15/Dockerfile b/php_fpm-alpine3.15/Dockerfile
deleted file mode 100644
index 87e75b6..0000000
diff --git a/php_fpm-alpine3.15/docker-php-entrypoint b/php_fpm-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_fpm-alpine3.15/docker-php-ext-configure b/php_fpm-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_fpm-alpine3.15/docker-php-ext-enable b/php_fpm-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_fpm-alpine3.15/docker-php-ext-install b/php_fpm-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_fpm-alpine3.15/docker-php-source b/php_fpm-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine3.16/Dockerfile
similarity index 100%
copy from php_fpm-alpine/Dockerfile
copy to php_fpm-alpine3.16/Dockerfile
diff --git a/php_7-fpm-alpine3.15/docker-php-entrypoint b/php_fpm-alpine3.16/docker-php-entrypoint
similarity index 100%
rename from php_7-fpm-alpine3.15/docker-php-entrypoint
rename to php_fpm-alpine3.16/docker-php-entrypoint
diff --git a/php_7-buster/docker-php-ext-configure b/php_fpm-alpine3.16/docker-php-ext-configure
similarity index 100%
rename from php_7-buster/docker-php-ext-configure
rename to php_fpm-alpine3.16/docker-php-ext-configure
diff --git a/php_7-buster/docker-php-ext-enable b/php_fpm-alpine3.16/docker-php-ext-enable
similarity index 100%
rename from php_7-buster/docker-php-ext-enable
rename to php_fpm-alpine3.16/docker-php-ext-enable
diff --git a/php_7-buster/docker-php-ext-install b/php_fpm-alpine3.16/docker-php-ext-install
similarity index 100%
rename from php_7-buster/docker-php-ext-install
rename to php_fpm-alpine3.16/docker-php-ext-install
diff --git a/php_7-buster/docker-php-source b/php_fpm-alpine3.16/docker-php-source
similarity index 100%
rename from php_7-buster/docker-php-source
rename to php_fpm-alpine3.16/docker-php-source
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index e87c5a9..4086208 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 # dependencies required for running "phpize"
 # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
diff --git a/php_zts-alpine3.15/Dockerfile b/php_zts-alpine3.15/Dockerfile
deleted file mode 100644
index 2cbb12c..0000000
diff --git a/php_zts-alpine3.15/docker-php-entrypoint b/php_zts-alpine3.15/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_zts-alpine3.15/docker-php-ext-configure b/php_zts-alpine3.15/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_zts-alpine3.15/docker-php-ext-enable b/php_zts-alpine3.15/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_zts-alpine3.15/docker-php-ext-install b/php_zts-alpine3.15/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_zts-alpine3.15/docker-php-source b/php_zts-alpine3.15/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine3.16/Dockerfile
similarity index 100%
copy from php_zts-alpine/Dockerfile
copy to php_zts-alpine3.16/Dockerfile
diff --git a/php_7-zts-alpine/docker-php-entrypoint b/php_zts-alpine3.16/docker-php-entrypoint
similarity index 100%
rename from php_7-zts-alpine/docker-php-entrypoint
rename to php_zts-alpine3.16/docker-php-entrypoint
diff --git a/php_7-fpm-alpine/docker-php-ext-configure b/php_zts-alpine3.16/docker-php-ext-configure
similarity index 100%
rename from php_7-fpm-alpine/docker-php-ext-configure
rename to php_zts-alpine3.16/docker-php-ext-configure
diff --git a/php_7-fpm-alpine/docker-php-ext-enable b/php_zts-alpine3.16/docker-php-ext-enable
similarity index 100%
rename from php_7-fpm-alpine/docker-php-ext-enable
rename to php_zts-alpine3.16/docker-php-ext-enable
diff --git a/php_7-fpm-alpine/docker-php-ext-install b/php_zts-alpine3.16/docker-php-ext-install
similarity index 100%
rename from php_7-fpm-alpine/docker-php-ext-install
rename to php_zts-alpine3.16/docker-php-ext-install
diff --git a/php_7-fpm-alpine/docker-php-source b/php_zts-alpine3.16/docker-php-source
similarity index 100%
rename from php_7-fpm-alpine/docker-php-source
rename to php_zts-alpine3.16/docker-php-source

Relevant Maintainers:

php: @tianon @yosifkit

tianon · 2022-11-30T20:22:58Z

FYI to affected maintainers still on PHP 7.4 -- it is now EOL and affected versions/variants should either be updated or removed:

adminer: @TimWolla
backdrop: @pirog @serundeputy @jenlampton @klonos
drupal: @tianon @yosifkit
friendica: @friendica @nupplaphil
joomla: @Llewellynvdm @HLeithner
mediawiki: @davidbarratt @legoktm @addshore
postfixadmin: @DavidGoodwin
wordpress: @tianon @yosifkit

TimWolla · 2022-12-01T15:22:01Z

adminer: @TimWolla

Yeah, it's literally all of them. I've previously attempted to upgrade Adminer to 8.0, but needed to revert in TimWolla/docker-adminer@0f6d378, as it isn't cleanly compatible and still isn't to the best of my knowledge. Last upstream commit and last upstream release both were in May 2021.

Not sure what the best course of action is, here. Either I revert the revert of the upgrade to PHP 8.0 (introducing bugs into some of the features) or it would need to be removed entirely (which would be sad, because I personally still use it almost daily).

tianon · 2022-12-01T18:51:34Z

That's unfortunate 😞

From https://www.adminer.org/#requirements, they do claim to support PHP 8, but yeah, it doesn't seem super actively maintained. 😭

There are several related bugs in their tracker (https://sourceforge.net/p/adminer/bugs-and-features/ 🙈) that don't have any official response. 😖

I don't think there are any Linux distributions committing to longer-term support for PHP 7.4, right? For the purposes of official images, I think our options are probably either PHP 8+ or image deprecation. 😞

TimWolla · 2022-12-01T19:05:02Z

they do claim to support PHP 8

It's … complicated. The issue with PHP 8 is newly added Warnings that make it into SQL dumps (which completely break the dump of course). I could technically just slap a php.ini configuration onto there to suppress those Warnings, but that might paper over some real issues and a database management tool is not really something where personally I'd like to see undefined behavior. In fact my smoke tests explicitly contain a check for Warnings to catch the most obvious issues: https://github.com/TimWolla/docker-adminer/blob/4f3e355425bffd35db7bc0487eb3166d94316578/.github/workflows/image.yml#L53

It's also not likely to get better with future PHP versions, every PHP version adds new warnings and often also introduces small incompatibilities (it's unavoidable with the huge API surface PHP exposes in it's standard library).

There are several related bugs in their tracker (https://sourceforge.net/p/adminer/bugs-and-features/ see_no_evil) that don't have any official response. confounded

There's even pull requests, such as: vrana/adminer#450 and vrana/adminer#429

I don't think there are any Linux distributions committing to longer-term support for PHP 7.4, right?

Debian Bullseye (the current stable) includes PHP 7.4 and I believe that PHP will continue to receive security patches as any other package in Debian. In fact there's also an Adminer package in Debian (https://tracker.debian.org/pkg/adminer), even in the current testing which even is PHP 8.1.

tianon · 2022-12-01T19:23:20Z

Debian Bullseye (the current stable) includes PHP 7.4 and I believe that PHP will continue to receive security patches as any other package in Debian. In fact there's also an Adminer package in Debian (https://tracker.debian.org/pkg/adminer), even in the current testing which even is PHP 8.1.

Yeah, that's interesting -- I'm surprised there aren't patches applied (https://salsa.debian.org/debian/adminer/-/tree/debian/sid/debian currently has no patches/ subfolder).

If you wanted to switch to Bullseye's PHP 7.4 packages, that seems reasonable (although slightly more work for you in the initial conversion). You'll want to keep an eye on https://packages.debian.org/bullseye/debian-security-support / https://salsa.debian.org/debian/debian-security-support/-/blob/bullseye/security-support-ended.deb11 to make sure it stays supported, but it's probably somewhat safe (certainly safer than the images we won't be maintaining anymore 😶).

TimWolla · 2022-12-02T16:17:11Z

If you wanted to switch to Bullseye's PHP 7.4 packages, that seems reasonable (although slightly more work for you in the initial conversion).

Okay, switching to the native Bullseye packages sounds reasonable to me as well. I'll put this somewhere near the top of my ToDo list.

but it's probably somewhat safe (certainly safer than the images we won't be maintaining anymore no_mouth).

Generally I would consider Adminer to be less affected than other PHP images, as it's a development tool. If there’s an admin interface to your production database exposed on the Internet then that’s already a security issue by default.

see docker-library/official-images#13622 (comment)

Update php

14bc597

Changes: - docker-library/php@d461611: Add Alpine 3.17 variant (docker-library/php#1348) - docker-library/php@2a7223d: Merge pull request docker-library/php#1349 from jnoordsij/remove-7.4

github-actions bot added the library/php label Nov 30, 2022

docker-library-bot force-pushed the php branch from 33d9295 to 14bc597 Compare November 30, 2022 19:47

yosifkit merged commit 6c3370e into docker-library:master Nov 30, 2022

yosifkit deleted the php branch November 30, 2022 20:19

tianon mentioned this pull request Nov 30, 2022

Drop PHP 7.4 (EOL), add Alpine 3.17 docker-library/drupal#229

Merged

DavidGoodwin mentioned this pull request Dec 1, 2022

Upgrade official images to PHP 8.x postfixadmin/docker#53

Closed

nupplaphil mentioned this pull request Dec 4, 2022

Update Friendica to php 8.0 friendica/docker#217

Merged

TimWolla added a commit to TimWolla/docker-adminer that referenced this pull request Dec 4, 2022

Migreate to Debian Bulleye's native PHP 7.4 packages

cac76fb

see docker-library/official-images#13622 (comment)

TimWolla mentioned this pull request Dec 4, 2022

Migrate to Debian Bulleye's native PHP 7.4 packages TimWolla/docker-adminer#129

Closed

nupplaphil mentioned this pull request Dec 4, 2022

Friendica - Bump to PHP 8.0 #13654

Merged

TimWolla mentioned this pull request Jun 27, 2023

FYI regarding upstream project status TimWolla/docker-adminer#147

Closed

legoktm mentioned this pull request Jul 14, 2023

Use PHP 8.0 & 8.1 as the base now that 7.4 is EOL wikimedia/mediawiki-docker#117

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update php #13622

Update php #13622

Uh oh!

tianon commented Nov 30, 2022 •

edited

Loading

Uh oh!

github-actions bot commented Nov 30, 2022

Uh oh!

tianon commented Nov 30, 2022

Uh oh!

TimWolla commented Dec 1, 2022

Uh oh!

tianon commented Dec 1, 2022

Uh oh!

TimWolla commented Dec 1, 2022

Uh oh!

tianon commented Dec 1, 2022

Uh oh!

TimWolla commented Dec 2, 2022

Uh oh!

Uh oh!

Update php #13622

Update php #13622

Uh oh!

Conversation

tianon commented Nov 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Nov 30, 2022

Uh oh!

tianon commented Nov 30, 2022

Uh oh!

TimWolla commented Dec 1, 2022

Uh oh!

tianon commented Dec 1, 2022

Uh oh!

TimWolla commented Dec 1, 2022

Uh oh!

tianon commented Dec 1, 2022

Uh oh!

TimWolla commented Dec 2, 2022

Uh oh!

Uh oh!

tianon commented Nov 30, 2022 •

edited

Loading