Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update php #15804

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Update php #15804

merged 1 commit into from
Nov 30, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 30, 2023

Changes:

Changes:

- docker-library/php@6c4b77d1: Merge pull request docker-library/php#1463 from jnoordsij/drop-php-8.0
- docker-library/php@21f3c6ba: Remove PHP 8.0 reference from Dockerfile template
- docker-library/php@d4de579e: Remove all versions.sh overrides as they are now obsolete
- docker-library/php@4d3ed4a9: Remove PHP 8.0 (EOL 26 November 2023)
Copy link

Diff for 7f6061c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8e22237..205ce82 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,61 +1,6 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/php.git
 
-Tags: 8.0.30-apache-bullseye, 8.0-apache-bullseye, 8.0.30-apache, 8.0-apache
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/bullseye/apache
-
-Tags: 8.0.30-apache-buster, 8.0-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/buster/apache
-
-Tags: 8.0.30-cli-alpine3.16, 8.0-cli-alpine3.16, 8.0.30-alpine3.16, 8.0-alpine3.16, 8.0.30-cli-alpine, 8.0-cli-alpine, 8.0.30-alpine, 8.0-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/alpine3.16/cli
-
-Tags: 8.0.30-cli-bullseye, 8.0-cli-bullseye, 8.0.30-bullseye, 8.0-bullseye, 8.0.30-cli, 8.0-cli, 8.0.30, 8.0
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/bullseye/cli
-
-Tags: 8.0.30-cli-buster, 8.0-cli-buster, 8.0.30-buster, 8.0-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/buster/cli
-
-Tags: 8.0.30-fpm-alpine3.16, 8.0-fpm-alpine3.16, 8.0.30-fpm-alpine, 8.0-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/alpine3.16/fpm
-
-Tags: 8.0.30-fpm-bullseye, 8.0-fpm-bullseye, 8.0.30-fpm, 8.0-fpm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/bullseye/fpm
-
-Tags: 8.0.30-fpm-buster, 8.0-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/buster/fpm
-
-Tags: 8.0.30-zts-alpine3.16, 8.0-zts-alpine3.16, 8.0.30-zts-alpine, 8.0-zts-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/alpine3.16/zts
-
-Tags: 8.0.30-zts-bullseye, 8.0-zts-bullseye, 8.0.30-zts, 8.0-zts
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/bullseye/zts
-
-Tags: 8.0.30-zts-buster, 8.0-zts-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 41c9ad0b43a50bbf46564f27779a01105df49b9a
-Directory: 8.0/buster/zts
-
 Tags: 8.1.26-apache-bookworm, 8.1-apache-bookworm, 8.1.26-apache, 8.1-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
@@ -66,11 +11,6 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
 Directory: 8.1/bullseye/apache
 
-Tags: 8.1.26-cli-alpine3.16, 8.1-cli-alpine3.16, 8.1.26-alpine3.16, 8.1-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
-Directory: 8.1/alpine3.16/cli
-
 Tags: 8.1.26-cli-alpine3.17, 8.1-cli-alpine3.17, 8.1.26-alpine3.17, 8.1-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
@@ -91,11 +31,6 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
 Directory: 8.1/bullseye/cli
 
-Tags: 8.1.26-fpm-alpine3.16, 8.1-fpm-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
-Directory: 8.1/alpine3.16/fpm
-
 Tags: 8.1.26-fpm-alpine3.17, 8.1-fpm-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
@@ -116,11 +51,6 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
 Directory: 8.1/bullseye/fpm
 
-Tags: 8.1.26-zts-alpine3.16, 8.1-zts-alpine3.16
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
-Directory: 8.1/alpine3.16/zts
-
 Tags: 8.1.26-zts-alpine3.17, 8.1-zts-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 25e17c7d52af3fe23bd3c04427c6011144b553ef
diff --git a/_bashbrew-list b/_bashbrew-list
index d101e2a..7ae16b1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -25,55 +25,8 @@ php:8-zts-alpine3.17
 php:8-zts-alpine3.18
 php:8-zts-bookworm
 php:8-zts-bullseye
-php:8.0
-php:8.0-alpine
-php:8.0-alpine3.16
-php:8.0-apache
-php:8.0-apache-bullseye
-php:8.0-apache-buster
-php:8.0-bullseye
-php:8.0-buster
-php:8.0-cli
-php:8.0-cli-alpine
-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.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.16
-php:8.0-zts-bullseye
-php:8.0-zts-buster
-php:8.0.30
-php:8.0.30-alpine
-php:8.0.30-alpine3.16
-php:8.0.30-apache
-php:8.0.30-apache-bullseye
-php:8.0.30-apache-buster
-php:8.0.30-bullseye
-php:8.0.30-buster
-php:8.0.30-cli
-php:8.0.30-cli-alpine
-php:8.0.30-cli-alpine3.16
-php:8.0.30-cli-bullseye
-php:8.0.30-cli-buster
-php:8.0.30-fpm
-php:8.0.30-fpm-alpine
-php:8.0.30-fpm-alpine3.16
-php:8.0.30-fpm-bullseye
-php:8.0.30-fpm-buster
-php:8.0.30-zts
-php:8.0.30-zts-alpine
-php:8.0.30-zts-alpine3.16
-php:8.0.30-zts-bullseye
-php:8.0.30-zts-buster
 php:8.1
 php:8.1-alpine
-php:8.1-alpine3.16
 php:8.1-alpine3.17
 php:8.1-alpine3.18
 php:8.1-apache
@@ -83,28 +36,24 @@ php:8.1-bookworm
 php:8.1-bullseye
 php:8.1-cli
 php:8.1-cli-alpine
-php:8.1-cli-alpine3.16
 php:8.1-cli-alpine3.17
 php:8.1-cli-alpine3.18
 php:8.1-cli-bookworm
 php:8.1-cli-bullseye
 php:8.1-fpm
 php:8.1-fpm-alpine
-php:8.1-fpm-alpine3.16
 php:8.1-fpm-alpine3.17
 php:8.1-fpm-alpine3.18
 php:8.1-fpm-bookworm
 php:8.1-fpm-bullseye
 php:8.1-zts
 php:8.1-zts-alpine
-php:8.1-zts-alpine3.16
 php:8.1-zts-alpine3.17
 php:8.1-zts-alpine3.18
 php:8.1-zts-bookworm
 php:8.1-zts-bullseye
 php:8.1.26
 php:8.1.26-alpine
-php:8.1.26-alpine3.16
 php:8.1.26-alpine3.17
 php:8.1.26-alpine3.18
 php:8.1.26-apache
@@ -114,21 +63,18 @@ php:8.1.26-bookworm
 php:8.1.26-bullseye
 php:8.1.26-cli
 php:8.1.26-cli-alpine
-php:8.1.26-cli-alpine3.16
 php:8.1.26-cli-alpine3.17
 php:8.1.26-cli-alpine3.18
 php:8.1.26-cli-bookworm
 php:8.1.26-cli-bullseye
 php:8.1.26-fpm
 php:8.1.26-fpm-alpine
-php:8.1.26-fpm-alpine3.16
 php:8.1.26-fpm-alpine3.17
 php:8.1.26-fpm-alpine3.18
 php:8.1.26-fpm-bookworm
 php:8.1.26-fpm-bullseye
 php:8.1.26-zts
 php:8.1.26-zts-alpine
-php:8.1.26-zts-alpine3.16
 php:8.1.26-zts-alpine3.17
 php:8.1.26-zts-alpine3.18
 php:8.1.26-zts-bookworm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index bd2b47b..690cbaa 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,27 +1,13 @@
-php:8.0-apache
-php:8.0-apache-buster
-php:8.0-alpine
-php:8.0
-php:8.0-buster
-php:8.0-fpm-alpine
-php:8.0-fpm
-php:8.0-fpm-buster
-php:8.0-zts-alpine
-php:8.0-zts
-php:8.0-zts-buster
 php:8.1-apache
 php:8.1-apache-bullseye
-php:8.1-alpine3.16
 php:8.1-alpine3.17
 php:8.1-alpine
 php:8.1
 php:8.1-bullseye
-php:8.1-fpm-alpine3.16
 php:8.1-fpm-alpine3.17
 php:8.1-fpm-alpine
 php:8.1-fpm
 php:8.1-fpm-bullseye
-php:8.1-zts-alpine3.16
 php:8.1-zts-alpine3.17
 php:8.1-zts-alpine
 php:8.1-zts
diff --git a/php_8.0-alpine/Dockerfile b/php_8.0-alpine/Dockerfile
deleted file mode 100644
index 75e7f91..0000000
diff --git a/php_8.0-alpine/docker-php-entrypoint b/php_8.0-alpine/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-alpine/docker-php-ext-configure b/php_8.0-alpine/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-alpine/docker-php-ext-enable b/php_8.0-alpine/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-alpine/docker-php-ext-install b/php_8.0-alpine/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-alpine/docker-php-source b/php_8.0-alpine/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-apache-buster/Dockerfile b/php_8.0-apache-buster/Dockerfile
deleted file mode 100644
index 5785a2f..0000000
diff --git a/php_8.0-apache-buster/apache2-foreground b/php_8.0-apache-buster/apache2-foreground
deleted file mode 100755
index 5fe22e2..0000000
diff --git a/php_8.0-apache-buster/docker-php-entrypoint b/php_8.0-apache-buster/docker-php-entrypoint
deleted file mode 100755
index 3d36d5e..0000000
diff --git a/php_8.0-apache-buster/docker-php-ext-configure b/php_8.0-apache-buster/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-apache-buster/docker-php-ext-enable b/php_8.0-apache-buster/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-apache-buster/docker-php-ext-install b/php_8.0-apache-buster/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-apache-buster/docker-php-source b/php_8.0-apache-buster/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-apache/Dockerfile b/php_8.0-apache/Dockerfile
deleted file mode 100644
index 1938dad..0000000
diff --git a/php_8.0-apache/apache2-foreground b/php_8.0-apache/apache2-foreground
deleted file mode 100755
index 5fe22e2..0000000
diff --git a/php_8.0-apache/docker-php-entrypoint b/php_8.0-apache/docker-php-entrypoint
deleted file mode 100755
index 3d36d5e..0000000
diff --git a/php_8.0-apache/docker-php-ext-configure b/php_8.0-apache/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-apache/docker-php-ext-enable b/php_8.0-apache/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-apache/docker-php-ext-install b/php_8.0-apache/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-apache/docker-php-source b/php_8.0-apache/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-buster/Dockerfile b/php_8.0-buster/Dockerfile
deleted file mode 100644
index 2f56208..0000000
diff --git a/php_8.0-buster/docker-php-entrypoint b/php_8.0-buster/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-buster/docker-php-ext-configure b/php_8.0-buster/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-buster/docker-php-ext-enable b/php_8.0-buster/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-buster/docker-php-ext-install b/php_8.0-buster/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-buster/docker-php-source b/php_8.0-buster/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-fpm-alpine/Dockerfile b/php_8.0-fpm-alpine/Dockerfile
deleted file mode 100644
index aa40bf8..0000000
diff --git a/php_8.0-fpm-alpine/docker-php-entrypoint b/php_8.0-fpm-alpine/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_8.0-fpm-alpine/docker-php-ext-configure b/php_8.0-fpm-alpine/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-fpm-alpine/docker-php-ext-enable b/php_8.0-fpm-alpine/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-fpm-alpine/docker-php-ext-install b/php_8.0-fpm-alpine/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-fpm-alpine/docker-php-source b/php_8.0-fpm-alpine/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-fpm-buster/Dockerfile b/php_8.0-fpm-buster/Dockerfile
deleted file mode 100644
index 9247f94..0000000
diff --git a/php_8.0-fpm-buster/docker-php-entrypoint b/php_8.0-fpm-buster/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_8.0-fpm-buster/docker-php-ext-configure b/php_8.0-fpm-buster/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-fpm-buster/docker-php-ext-enable b/php_8.0-fpm-buster/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-fpm-buster/docker-php-ext-install b/php_8.0-fpm-buster/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-fpm-buster/docker-php-source b/php_8.0-fpm-buster/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-fpm/Dockerfile b/php_8.0-fpm/Dockerfile
deleted file mode 100644
index 3027591..0000000
diff --git a/php_8.0-fpm/docker-php-entrypoint b/php_8.0-fpm/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_8.0-fpm/docker-php-ext-configure b/php_8.0-fpm/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-fpm/docker-php-ext-enable b/php_8.0-fpm/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-fpm/docker-php-ext-install b/php_8.0-fpm/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-fpm/docker-php-source b/php_8.0-fpm/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-zts-alpine/Dockerfile b/php_8.0-zts-alpine/Dockerfile
deleted file mode 100644
index f25b765..0000000
diff --git a/php_8.0-zts-alpine/docker-php-entrypoint b/php_8.0-zts-alpine/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-zts-alpine/docker-php-ext-configure b/php_8.0-zts-alpine/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-zts-alpine/docker-php-ext-enable b/php_8.0-zts-alpine/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-zts-alpine/docker-php-ext-install b/php_8.0-zts-alpine/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-zts-alpine/docker-php-source b/php_8.0-zts-alpine/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-zts-buster/Dockerfile b/php_8.0-zts-buster/Dockerfile
deleted file mode 100644
index 7d50572..0000000
diff --git a/php_8.0-zts-buster/docker-php-entrypoint b/php_8.0-zts-buster/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-zts-buster/docker-php-ext-configure b/php_8.0-zts-buster/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-zts-buster/docker-php-ext-enable b/php_8.0-zts-buster/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-zts-buster/docker-php-ext-install b/php_8.0-zts-buster/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-zts-buster/docker-php-source b/php_8.0-zts-buster/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0-zts/Dockerfile b/php_8.0-zts/Dockerfile
deleted file mode 100644
index e6679aa..0000000
diff --git a/php_8.0-zts/docker-php-entrypoint b/php_8.0-zts/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0-zts/docker-php-ext-configure b/php_8.0-zts/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0-zts/docker-php-ext-enable b/php_8.0-zts/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0-zts/docker-php-ext-install b/php_8.0-zts/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0-zts/docker-php-source b/php_8.0-zts/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.0/Dockerfile b/php_8.0/Dockerfile
deleted file mode 100644
index e1c95ba..0000000
diff --git a/php_8.0/docker-php-entrypoint b/php_8.0/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.0/docker-php-ext-configure b/php_8.0/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.0/docker-php-ext-enable b/php_8.0/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.0/docker-php-ext-install b/php_8.0/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.0/docker-php-source b/php_8.0/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.1-alpine3.16/Dockerfile b/php_8.1-alpine3.16/Dockerfile
deleted file mode 100644
index 59d3c00..0000000
diff --git a/php_8.1-alpine3.16/docker-php-entrypoint b/php_8.1-alpine3.16/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.1-alpine3.16/docker-php-ext-configure b/php_8.1-alpine3.16/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.1-alpine3.16/docker-php-ext-enable b/php_8.1-alpine3.16/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.1-alpine3.16/docker-php-ext-install b/php_8.1-alpine3.16/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.1-alpine3.16/docker-php-source b/php_8.1-alpine3.16/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.1-fpm-alpine3.16/Dockerfile b/php_8.1-fpm-alpine3.16/Dockerfile
deleted file mode 100644
index 773abd8..0000000
diff --git a/php_8.1-fpm-alpine3.16/docker-php-entrypoint b/php_8.1-fpm-alpine3.16/docker-php-entrypoint
deleted file mode 100755
index 86343d8..0000000
diff --git a/php_8.1-fpm-alpine3.16/docker-php-ext-configure b/php_8.1-fpm-alpine3.16/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.1-fpm-alpine3.16/docker-php-ext-enable b/php_8.1-fpm-alpine3.16/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.1-fpm-alpine3.16/docker-php-ext-install b/php_8.1-fpm-alpine3.16/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.1-fpm-alpine3.16/docker-php-source b/php_8.1-fpm-alpine3.16/docker-php-source
deleted file mode 100755
index 9033d24..0000000
diff --git a/php_8.1-zts-alpine3.16/Dockerfile b/php_8.1-zts-alpine3.16/Dockerfile
deleted file mode 100644
index 3f202ab..0000000
diff --git a/php_8.1-zts-alpine3.16/docker-php-entrypoint b/php_8.1-zts-alpine3.16/docker-php-entrypoint
deleted file mode 100755
index 88a016c..0000000
diff --git a/php_8.1-zts-alpine3.16/docker-php-ext-configure b/php_8.1-zts-alpine3.16/docker-php-ext-configure
deleted file mode 100755
index 34fc133..0000000
diff --git a/php_8.1-zts-alpine3.16/docker-php-ext-enable b/php_8.1-zts-alpine3.16/docker-php-ext-enable
deleted file mode 100755
index 41d20bb..0000000
diff --git a/php_8.1-zts-alpine3.16/docker-php-ext-install b/php_8.1-zts-alpine3.16/docker-php-ext-install
deleted file mode 100755
index aa0b96c..0000000
diff --git a/php_8.1-zts-alpine3.16/docker-php-source b/php_8.1-zts-alpine3.16/docker-php-source
deleted file mode 100755
index 9033d24..0000000

Relevant Maintainers:

@tianon
Copy link
Member Author

tianon commented Nov 30, 2023

FYI to affected maintainers:

@yosifkit yosifkit merged commit 793bbec into docker-library:master Nov 30, 2023
47 checks passed
@yosifkit yosifkit deleted the php branch November 30, 2023 20:05
@legoktm
Copy link
Contributor

legoktm commented Dec 5, 2023

@tianon for MediaWiki we are most likely going to have one final 1.35.x release (this month I hope), which is the only version still using 8.0 - is that going to be fine? Or do we need to move it to 8.1 beforehand, or just drop that version?

@tianon
Copy link
Member Author

tianon commented Dec 5, 2023

If there's only one more (and it's happening Soon™), doing it on PHP 8.0 one final time seems reasonable to me. 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants