Update php #14845
Merged
Update php #14845
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
Changes: - docker-library/php@86b8b137: Merge pull request docker-library/php#1416 from infosiftr/bookworm - docker-library/php@7838b365: Add Debian bookworm, remove buster - docker-library/php@6fce78bd: enable Max Execution Timers for ZTS builds (docker-library/php#1382)
Diff for c89c5a0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 561bb4a..83cef37 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/php.git
Tags: 8.0.29-apache-bullseye, 8.0-apache-bullseye, 8.0.29-apache, 8.0-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/bullseye/apache
Tags: 8.0.29-apache-buster, 8.0-apache-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/buster/apache
Tags: 8.0.29-cli-alpine3.16, 8.0-cli-alpine3.16, 8.0.29-alpine3.16, 8.0-alpine3.16, 8.0.29-cli-alpine, 8.0-cli-alpine, 8.0.29-alpine, 8.0-alpine
@@ -18,12 +18,12 @@ Directory: 8.0/alpine3.16/cli
Tags: 8.0.29-cli-bullseye, 8.0-cli-bullseye, 8.0.29-bullseye, 8.0-bullseye, 8.0.29-cli, 8.0-cli, 8.0.29, 8.0
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/bullseye/cli
Tags: 8.0.29-cli-buster, 8.0-cli-buster, 8.0.29-buster, 8.0-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/buster/cli
Tags: 8.0.29-fpm-alpine3.16, 8.0-fpm-alpine3.16, 8.0.29-fpm-alpine, 8.0-fpm-alpine
@@ -33,12 +33,12 @@ Directory: 8.0/alpine3.16/fpm
Tags: 8.0.29-fpm-bullseye, 8.0-fpm-bullseye, 8.0.29-fpm, 8.0-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/bullseye/fpm
Tags: 8.0.29-fpm-buster, 8.0-fpm-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/buster/fpm
Tags: 8.0.29-zts-alpine3.16, 8.0-zts-alpine3.16, 8.0.29-zts-alpine, 8.0-zts-alpine
@@ -48,23 +48,23 @@ Directory: 8.0/alpine3.16/zts
Tags: 8.0.29-zts-bullseye, 8.0-zts-bullseye, 8.0.29-zts, 8.0-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/bullseye/zts
Tags: 8.0.29-zts-buster, 8.0-zts-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1bb258379b76fc0266d337de7800681f5b4a9f09
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.0/buster/zts
-Tags: 8.1.20-apache-bullseye, 8.1-apache-bullseye, 8.1.20-apache, 8.1-apache
+Tags: 8.1.20-apache-bookworm, 8.1-apache-bookworm, 8.1.20-apache, 8.1-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/bullseye/apache
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bookworm/apache
-Tags: 8.1.20-apache-buster, 8.1-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/buster/apache
+Tags: 8.1.20-apache-bullseye, 8.1-apache-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bullseye/apache
Tags: 8.1.20-cli-alpine3.16, 8.1-cli-alpine3.16, 8.1.20-alpine3.16, 8.1-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -81,15 +81,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
Directory: 8.1/alpine3.18/cli
-Tags: 8.1.20-cli-bullseye, 8.1-cli-bullseye, 8.1.20-bullseye, 8.1-bullseye, 8.1.20-cli, 8.1-cli, 8.1.20, 8.1
+Tags: 8.1.20-cli-bookworm, 8.1-cli-bookworm, 8.1.20-bookworm, 8.1-bookworm, 8.1.20-cli, 8.1-cli, 8.1.20, 8.1
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/bullseye/cli
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bookworm/cli
-Tags: 8.1.20-cli-buster, 8.1-cli-buster, 8.1.20-buster, 8.1-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/buster/cli
+Tags: 8.1.20-cli-bullseye, 8.1-cli-bullseye, 8.1.20-bullseye, 8.1-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bullseye/cli
Tags: 8.1.20-fpm-alpine3.16, 8.1-fpm-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -106,51 +106,51 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
Directory: 8.1/alpine3.18/fpm
-Tags: 8.1.20-fpm-bullseye, 8.1-fpm-bullseye, 8.1.20-fpm, 8.1-fpm
+Tags: 8.1.20-fpm-bookworm, 8.1-fpm-bookworm, 8.1.20-fpm, 8.1-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/bullseye/fpm
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bookworm/fpm
-Tags: 8.1.20-fpm-buster, 8.1-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/buster/fpm
+Tags: 8.1.20-fpm-bullseye, 8.1-fpm-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bullseye/fpm
Tags: 8.1.20-zts-alpine3.16, 8.1-zts-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 6fce78bd808bcdace098ab4065ba2d41e8bedc4e
Directory: 8.1/alpine3.16/zts
Tags: 8.1.20-zts-alpine3.17, 8.1-zts-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 6fce78bd808bcdace098ab4065ba2d41e8bedc4e
Directory: 8.1/alpine3.17/zts
Tags: 8.1.20-zts-alpine3.18, 8.1-zts-alpine3.18, 8.1.20-zts-alpine, 8.1-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 6fce78bd808bcdace098ab4065ba2d41e8bedc4e
Directory: 8.1/alpine3.18/zts
-Tags: 8.1.20-zts-bullseye, 8.1-zts-bullseye, 8.1.20-zts, 8.1-zts
+Tags: 8.1.20-zts-bookworm, 8.1-zts-bookworm, 8.1.20-zts, 8.1-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.1/bookworm/zts
+
+Tags: 8.1.20-zts-bullseye, 8.1-zts-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.1/bullseye/zts
-Tags: 8.1.20-zts-buster, 8.1-zts-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.1/buster/zts
+Tags: 8.2.7-apache-bookworm, 8.2-apache-bookworm, 8-apache-bookworm, apache-bookworm, 8.2.7-apache, 8.2-apache, 8-apache, apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.2/bookworm/apache
-Tags: 8.2.7-apache-bullseye, 8.2-apache-bullseye, 8-apache-bullseye, apache-bullseye, 8.2.7-apache, 8.2-apache, 8-apache, apache
+Tags: 8.2.7-apache-bullseye, 8.2-apache-bullseye, 8-apache-bullseye, apache-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.2/bullseye/apache
-Tags: 8.2.7-apache-buster, 8.2-apache-buster, 8-apache-buster, apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.2/buster/apache
-
Tags: 8.2.7-cli-alpine3.17, 8.2-cli-alpine3.17, 8-cli-alpine3.17, cli-alpine3.17, 8.2.7-alpine3.17, 8.2-alpine3.17, 8-alpine3.17, alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
@@ -161,15 +161,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
Directory: 8.2/alpine3.18/cli
-Tags: 8.2.7-cli-bullseye, 8.2-cli-bullseye, 8-cli-bullseye, cli-bullseye, 8.2.7-bullseye, 8.2-bullseye, 8-bullseye, bullseye, 8.2.7-cli, 8.2-cli, 8-cli, cli, 8.2.7, 8.2, 8, latest
+Tags: 8.2.7-cli-bookworm, 8.2-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.2.7-bookworm, 8.2-bookworm, 8-bookworm, bookworm, 8.2.7-cli, 8.2-cli, 8-cli, cli, 8.2.7, 8.2, 8, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.2/bullseye/cli
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.2/bookworm/cli
-Tags: 8.2.7-cli-buster, 8.2-cli-buster, 8-cli-buster, cli-buster, 8.2.7-buster, 8.2-buster, 8-buster, buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.2/buster/cli
+Tags: 8.2.7-cli-bullseye, 8.2-cli-bullseye, 8-cli-bullseye, cli-bullseye, 8.2.7-bullseye, 8.2-bullseye, 8-bullseye, bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.2/bullseye/cli
Tags: 8.2.7-fpm-alpine3.17, 8.2-fpm-alpine3.17, 8-fpm-alpine3.17, fpm-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -181,46 +181,46 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
Directory: 8.2/alpine3.18/fpm
-Tags: 8.2.7-fpm-bullseye, 8.2-fpm-bullseye, 8-fpm-bullseye, fpm-bullseye, 8.2.7-fpm, 8.2-fpm, 8-fpm, fpm
+Tags: 8.2.7-fpm-bookworm, 8.2-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm, 8.2.7-fpm, 8.2-fpm, 8-fpm, fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.2/bullseye/fpm
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.2/bookworm/fpm
-Tags: 8.2.7-fpm-buster, 8.2-fpm-buster, 8-fpm-buster, fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.2/buster/fpm
+Tags: 8.2.7-fpm-bullseye, 8.2-fpm-bullseye, 8-fpm-bullseye, fpm-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.2/bullseye/fpm
Tags: 8.2.7-zts-alpine3.17, 8.2-zts-alpine3.17, 8-zts-alpine3.17, zts-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 6fce78bd808bcdace098ab4065ba2d41e8bedc4e
Directory: 8.2/alpine3.17/zts
Tags: 8.2.7-zts-alpine3.18, 8.2-zts-alpine3.18, 8-zts-alpine3.18, zts-alpine3.18, 8.2.7-zts-alpine, 8.2-zts-alpine, 8-zts-alpine, zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 6fce78bd808bcdace098ab4065ba2d41e8bedc4e
Directory: 8.2/alpine3.18/zts
-Tags: 8.2.7-zts-bullseye, 8.2-zts-bullseye, 8-zts-bullseye, zts-bullseye, 8.2.7-zts, 8.2-zts, 8-zts, zts
+Tags: 8.2.7-zts-bookworm, 8.2-zts-bookworm, 8-zts-bookworm, zts-bookworm, 8.2.7-zts, 8.2-zts, 8-zts, zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.2/bookworm/zts
+
+Tags: 8.2.7-zts-bullseye, 8.2-zts-bullseye, 8-zts-bullseye, zts-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.2/bullseye/zts
-Tags: 8.2.7-zts-buster, 8.2-zts-buster, 8-zts-buster, zts-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 83461ac6dbfa05acb3d743e10404983ce89334f5
-Directory: 8.2/buster/zts
+Tags: 8.3.0alpha1-apache-bookworm, 8.3-rc-apache-bookworm, 8.3.0alpha1-apache, 8.3-rc-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bookworm/apache
-Tags: 8.3.0alpha1-apache-bullseye, 8.3-rc-apache-bullseye, 8.3.0alpha1-apache, 8.3-rc-apache
+Tags: 8.3.0alpha1-apache-bullseye, 8.3-rc-apache-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
Directory: 8.3-rc/bullseye/apache
-Tags: 8.3.0alpha1-apache-buster, 8.3-rc-apache-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/buster/apache
-
Tags: 8.3.0alpha1-cli-alpine3.17, 8.3-rc-cli-alpine3.17, 8.3.0alpha1-alpine3.17, 8.3-rc-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
@@ -231,15 +231,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
Directory: 8.3-rc/alpine3.18/cli
-Tags: 8.3.0alpha1-cli-bullseye, 8.3-rc-cli-bullseye, 8.3.0alpha1-bullseye, 8.3-rc-bullseye, 8.3.0alpha1-cli, 8.3-rc-cli, 8.3.0alpha1, 8.3-rc
+Tags: 8.3.0alpha1-cli-bookworm, 8.3-rc-cli-bookworm, 8.3.0alpha1-bookworm, 8.3-rc-bookworm, 8.3.0alpha1-cli, 8.3-rc-cli, 8.3.0alpha1, 8.3-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/bullseye/cli
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bookworm/cli
-Tags: 8.3.0alpha1-cli-buster, 8.3-rc-cli-buster, 8.3.0alpha1-buster, 8.3-rc-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/buster/cli
+Tags: 8.3.0alpha1-cli-bullseye, 8.3-rc-cli-bullseye, 8.3.0alpha1-bullseye, 8.3-rc-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bullseye/cli
Tags: 8.3.0alpha1-fpm-alpine3.17, 8.3-rc-fpm-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -251,15 +251,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
Directory: 8.3-rc/alpine3.18/fpm
-Tags: 8.3.0alpha1-fpm-bullseye, 8.3-rc-fpm-bullseye, 8.3.0alpha1-fpm, 8.3-rc-fpm
+Tags: 8.3.0alpha1-fpm-bookworm, 8.3-rc-fpm-bookworm, 8.3.0alpha1-fpm, 8.3-rc-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/bullseye/fpm
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bookworm/fpm
-Tags: 8.3.0alpha1-fpm-buster, 8.3-rc-fpm-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/buster/fpm
+Tags: 8.3.0alpha1-fpm-bullseye, 8.3-rc-fpm-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bullseye/fpm
Tags: 8.3.0alpha1-zts-alpine3.17, 8.3-rc-zts-alpine3.17
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -271,12 +271,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
Directory: 8.3-rc/alpine3.18/zts
-Tags: 8.3.0alpha1-zts-bullseye, 8.3-rc-zts-bullseye, 8.3.0alpha1-zts, 8.3-rc-zts
+Tags: 8.3.0alpha1-zts-bookworm, 8.3-rc-zts-bookworm, 8.3.0alpha1-zts, 8.3-rc-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/bullseye/zts
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bookworm/zts
-Tags: 8.3.0alpha1-zts-buster, 8.3-rc-zts-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f30e0e2ca7692e144d22449d015c0b51e06739af
-Directory: 8.3-rc/buster/zts
+Tags: 8.3.0alpha1-zts-bullseye, 8.3-rc-zts-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7838b365f3262d70e7b164ffae852407a7a990b7
+Directory: 8.3-rc/bullseye/zts
diff --git a/_bashbrew-list b/_bashbrew-list
index 74000b9..f51f575 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,28 +3,28 @@ php:8-alpine
php:8-alpine3.17
php:8-alpine3.18
php:8-apache
+php:8-apache-bookworm
php:8-apache-bullseye
-php:8-apache-buster
+php:8-bookworm
php:8-bullseye
-php:8-buster
php:8-cli
php:8-cli-alpine
php:8-cli-alpine3.17
php:8-cli-alpine3.18
+php:8-cli-bookworm
php:8-cli-bullseye
-php:8-cli-buster
php:8-fpm
php:8-fpm-alpine
php:8-fpm-alpine3.17
php:8-fpm-alpine3.18
+php:8-fpm-bookworm
php:8-fpm-bullseye
-php:8-fpm-buster
php:8-zts
php:8-zts-alpine
php:8-zts-alpine3.17
php:8-zts-alpine3.18
+php:8-zts-bookworm
php:8-zts-bullseye
-php:8-zts-buster
php:8.0
php:8.0-alpine
php:8.0-alpine3.16
@@ -77,194 +77,194 @@ php:8.1-alpine3.16
php:8.1-alpine3.17
php:8.1-alpine3.18
php:8.1-apache
+php:8.1-apache-bookworm
php:8.1-apache-bullseye
-php:8.1-apache-buster
+php:8.1-bookworm
php:8.1-bullseye
-php:8.1-buster
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-cli-buster
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-fpm-buster
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-zts-buster
php:8.1.20
php:8.1.20-alpine
php:8.1.20-alpine3.16
php:8.1.20-alpine3.17
php:8.1.20-alpine3.18
php:8.1.20-apache
+php:8.1.20-apache-bookworm
php:8.1.20-apache-bullseye
-php:8.1.20-apache-buster
+php:8.1.20-bookworm
php:8.1.20-bullseye
-php:8.1.20-buster
php:8.1.20-cli
php:8.1.20-cli-alpine
php:8.1.20-cli-alpine3.16
php:8.1.20-cli-alpine3.17
php:8.1.20-cli-alpine3.18
+php:8.1.20-cli-bookworm
php:8.1.20-cli-bullseye
-php:8.1.20-cli-buster
php:8.1.20-fpm
php:8.1.20-fpm-alpine
php:8.1.20-fpm-alpine3.16
php:8.1.20-fpm-alpine3.17
php:8.1.20-fpm-alpine3.18
+php:8.1.20-fpm-bookworm
php:8.1.20-fpm-bullseye
-php:8.1.20-fpm-buster
php:8.1.20-zts
php:8.1.20-zts-alpine
php:8.1.20-zts-alpine3.16
php:8.1.20-zts-alpine3.17
php:8.1.20-zts-alpine3.18
+php:8.1.20-zts-bookworm
php:8.1.20-zts-bullseye
-php:8.1.20-zts-buster
php:8.2
php:8.2-alpine
php:8.2-alpine3.17
php:8.2-alpine3.18
php:8.2-apache
+php:8.2-apache-bookworm
php:8.2-apache-bullseye
-php:8.2-apache-buster
+php:8.2-bookworm
php:8.2-bullseye
-php:8.2-buster
php:8.2-cli
php:8.2-cli-alpine
php:8.2-cli-alpine3.17
php:8.2-cli-alpine3.18
+php:8.2-cli-bookworm
php:8.2-cli-bullseye
-php:8.2-cli-buster
php:8.2-fpm
php:8.2-fpm-alpine
php:8.2-fpm-alpine3.17
php:8.2-fpm-alpine3.18
+php:8.2-fpm-bookworm
php:8.2-fpm-bullseye
-php:8.2-fpm-buster
php:8.2-zts
php:8.2-zts-alpine
php:8.2-zts-alpine3.17
php:8.2-zts-alpine3.18
+php:8.2-zts-bookworm
php:8.2-zts-bullseye
-php:8.2-zts-buster
php:8.2.7
php:8.2.7-alpine
php:8.2.7-alpine3.17
php:8.2.7-alpine3.18
php:8.2.7-apache
+php:8.2.7-apache-bookworm
php:8.2.7-apache-bullseye
-php:8.2.7-apache-buster
+php:8.2.7-bookworm
php:8.2.7-bullseye
-php:8.2.7-buster
php:8.2.7-cli
php:8.2.7-cli-alpine
php:8.2.7-cli-alpine3.17
php:8.2.7-cli-alpine3.18
+php:8.2.7-cli-bookworm
php:8.2.7-cli-bullseye
-php:8.2.7-cli-buster
php:8.2.7-fpm
php:8.2.7-fpm-alpine
php:8.2.7-fpm-alpine3.17
php:8.2.7-fpm-alpine3.18
+php:8.2.7-fpm-bookworm
php:8.2.7-fpm-bullseye
-php:8.2.7-fpm-buster
php:8.2.7-zts
php:8.2.7-zts-alpine
php:8.2.7-zts-alpine3.17
php:8.2.7-zts-alpine3.18
+php:8.2.7-zts-bookworm
php:8.2.7-zts-bullseye
-php:8.2.7-zts-buster
php:8.3-rc
php:8.3-rc-alpine
php:8.3-rc-alpine3.17
php:8.3-rc-alpine3.18
php:8.3-rc-apache
+php:8.3-rc-apache-bookworm
php:8.3-rc-apache-bullseye
-php:8.3-rc-apache-buster
+php:8.3-rc-bookworm
php:8.3-rc-bullseye
-php:8.3-rc-buster
php:8.3-rc-cli
php:8.3-rc-cli-alpine
php:8.3-rc-cli-alpine3.17
php:8.3-rc-cli-alpine3.18
+php:8.3-rc-cli-bookworm
php:8.3-rc-cli-bullseye
-php:8.3-rc-cli-buster
php:8.3-rc-fpm
php:8.3-rc-fpm-alpine
php:8.3-rc-fpm-alpine3.17
php:8.3-rc-fpm-alpine3.18
+php:8.3-rc-fpm-bookworm
php:8.3-rc-fpm-bullseye
-php:8.3-rc-fpm-buster
php:8.3-rc-zts
php:8.3-rc-zts-alpine
php:8.3-rc-zts-alpine3.17
php:8.3-rc-zts-alpine3.18
+php:8.3-rc-zts-bookworm
php:8.3-rc-zts-bullseye
-php:8.3-rc-zts-buster
php:8.3.0alpha1
php:8.3.0alpha1-alpine
php:8.3.0alpha1-alpine3.17
php:8.3.0alpha1-alpine3.18
php:8.3.0alpha1-apache
+php:8.3.0alpha1-apache-bookworm
php:8.3.0alpha1-apache-bullseye
-php:8.3.0alpha1-apache-buster
+php:8.3.0alpha1-bookworm
php:8.3.0alpha1-bullseye
-php:8.3.0alpha1-buster
php:8.3.0alpha1-cli
php:8.3.0alpha1-cli-alpine
php:8.3.0alpha1-cli-alpine3.17
php:8.3.0alpha1-cli-alpine3.18
+php:8.3.0alpha1-cli-bookworm
php:8.3.0alpha1-cli-bullseye
-php:8.3.0alpha1-cli-buster
php:8.3.0alpha1-fpm
php:8.3.0alpha1-fpm-alpine
php:8.3.0alpha1-fpm-alpine3.17
php:8.3.0alpha1-fpm-alpine3.18
+php:8.3.0alpha1-fpm-bookworm
php:8.3.0alpha1-fpm-bullseye
-php:8.3.0alpha1-fpm-buster
php:8.3.0alpha1-zts
php:8.3.0alpha1-zts-alpine
php:8.3.0alpha1-zts-alpine3.17
php:8.3.0alpha1-zts-alpine3.18
+php:8.3.0alpha1-zts-bookworm
php:8.3.0alpha1-zts-bullseye
-php:8.3.0alpha1-zts-buster
php:alpine
php:alpine3.17
php:alpine3.18
php:apache
+php:apache-bookworm
php:apache-bullseye
-php:apache-buster
+php:bookworm
php:bullseye
-php:buster
php:cli
php:cli-alpine
php:cli-alpine3.17
php:cli-alpine3.18
+php:cli-bookworm
php:cli-bullseye
-php:cli-buster
php:fpm
php:fpm-alpine
php:fpm-alpine3.17
php:fpm-alpine3.18
+php:fpm-bookworm
php:fpm-bullseye
-php:fpm-buster
php:latest
php:zts
php:zts-alpine
php:zts-alpine3.17
php:zts-alpine3.18
+php:zts-bookworm
php:zts-bullseye
-php:zts-buster
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 502bf0d..112e5e6 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -10,47 +10,47 @@ php:8.0-zts-alpine
php:8.0-zts
php:8.0-zts-buster
php:8.1-apache
-php:8.1-apache-buster
+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-buster
+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-buster
+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
-php:8.1-zts-buster
+php:8.1-zts-bullseye
php:apache
-php:apache-buster
+php:apache-bullseye
php:alpine3.17
php:alpine
php:latest
-php:buster
+php:bullseye
php:fpm-alpine3.17
php:fpm-alpine
php:fpm
-php:fpm-buster
+php:fpm-bullseye
php:zts-alpine3.17
php:zts-alpine
php:zts
-php:zts-buster
+php:zts-bullseye
php:8.3-rc-apache
-php:8.3-rc-apache-buster
+php:8.3-rc-apache-bullseye
php:8.3-rc-alpine3.17
php:8.3-rc-alpine
php:8.3-rc
-php:8.3-rc-buster
+php:8.3-rc-bullseye
php:8.3-rc-fpm-alpine3.17
php:8.3-rc-fpm-alpine
php:8.3-rc-fpm
-php:8.3-rc-fpm-buster
+php:8.3-rc-fpm-bullseye
php:8.3-rc-zts-alpine3.17
php:8.3-rc-zts-alpine
php:8.3-rc-zts
-php:8.3-rc-zts-buster
+php:8.3-rc-zts-bullseye
diff --git a/php_8.0-apache-buster/Dockerfile b/php_8.0-apache-buster/Dockerfile
index c5b3303..dd19d24 100644
--- a/php_8.0-apache-buster/Dockerfile
+++ b/php_8.0-apache-buster/Dockerfile
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0-apache/Dockerfile b/php_8.0-apache/Dockerfile
index f22758a..e1e30ba 100644
--- a/php_8.0-apache/Dockerfile
+++ b/php_8.0-apache/Dockerfile
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0-buster/Dockerfile b/php_8.0-buster/Dockerfile
index 096557b..52d33c3 100644
--- a/php_8.0-buster/Dockerfile
+++ b/php_8.0-buster/Dockerfile
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0-fpm-buster/Dockerfile b/php_8.0-fpm-buster/Dockerfile
index aa4d3b9..fdfdbdc 100644
--- a/php_8.0-fpm-buster/Dockerfile
+++ b/php_8.0-fpm-buster/Dockerfile
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0-fpm/Dockerfile b/php_8.0-fpm/Dockerfile
index 7d52db1..9c782af 100644
--- a/php_8.0-fpm/Dockerfile
+++ b/php_8.0-fpm/Dockerfile
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0-zts-buster/Dockerfile b/php_8.0-zts-buster/Dockerfile
index f5066c8..5327bf6 100644
--- a/php_8.0-zts-buster/Dockerfile
+++ b/php_8.0-zts-buster/Dockerfile
@@ -203,7 +203,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0-zts/Dockerfile b/php_8.0-zts/Dockerfile
index 985ceb2..041fa92 100644
--- a/php_8.0-zts/Dockerfile
+++ b/php_8.0-zts/Dockerfile
@@ -203,7 +203,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.0/Dockerfile b/php_8.0/Dockerfile
index cb8f903..f1038c4 100644
--- a/php_8.0/Dockerfile
+++ b/php_8.0/Dockerfile
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-apache-buster/Dockerfile b/php_8.1-apache-bullseye/Dockerfile
similarity index 98%
rename from php_8.1-apache-buster/Dockerfile
rename to php_8.1-apache-bullseye/Dockerfile
index 4f7e880..38cab08 100644
--- a/php_8.1-apache-buster/Dockerfile
+++ b/php_8.1-apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-apache-buster/apache2-foreground b/php_8.1-apache-bullseye/apache2-foreground
similarity index 100%
rename from php_8.1-apache-buster/apache2-foreground
rename to php_8.1-apache-bullseye/apache2-foreground
diff --git a/php_8.1-apache-buster/docker-php-entrypoint b/php_8.1-apache-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.1-apache-buster/docker-php-entrypoint
rename to php_8.1-apache-bullseye/docker-php-entrypoint
diff --git a/php_8.1-apache-buster/docker-php-ext-configure b/php_8.1-apache-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.1-apache-buster/docker-php-ext-configure
rename to php_8.1-apache-bullseye/docker-php-ext-configure
diff --git a/php_8.1-apache-buster/docker-php-ext-enable b/php_8.1-apache-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.1-apache-buster/docker-php-ext-enable
rename to php_8.1-apache-bullseye/docker-php-ext-enable
diff --git a/php_8.1-apache-buster/docker-php-ext-install b/php_8.1-apache-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.1-apache-buster/docker-php-ext-install
rename to php_8.1-apache-bullseye/docker-php-ext-install
diff --git a/php_8.1-apache-buster/docker-php-source b/php_8.1-apache-bullseye/docker-php-source
similarity index 100%
rename from php_8.1-apache-buster/docker-php-source
rename to php_8.1-apache-bullseye/docker-php-source
diff --git a/php_8.1-apache/Dockerfile b/php_8.1-apache/Dockerfile
index ba89909..eee0d54 100644
--- a/php_8.1-apache/Dockerfile
+++ b/php_8.1-apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-buster/Dockerfile b/php_8.1-bullseye/Dockerfile
similarity index 98%
rename from php_8.1-buster/Dockerfile
rename to php_8.1-bullseye/Dockerfile
index d767b8b..01b686e 100644
--- a/php_8.1-buster/Dockerfile
+++ b/php_8.1-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-buster/docker-php-entrypoint b/php_8.1-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.1-buster/docker-php-entrypoint
rename to php_8.1-bullseye/docker-php-entrypoint
diff --git a/php_8.1-buster/docker-php-ext-configure b/php_8.1-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.1-buster/docker-php-ext-configure
rename to php_8.1-bullseye/docker-php-ext-configure
diff --git a/php_8.1-buster/docker-php-ext-enable b/php_8.1-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.1-buster/docker-php-ext-enable
rename to php_8.1-bullseye/docker-php-ext-enable
diff --git a/php_8.1-buster/docker-php-ext-install b/php_8.1-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.1-buster/docker-php-ext-install
rename to php_8.1-bullseye/docker-php-ext-install
diff --git a/php_8.1-buster/docker-php-source b/php_8.1-bullseye/docker-php-source
similarity index 100%
rename from php_8.1-buster/docker-php-source
rename to php_8.1-bullseye/docker-php-source
diff --git a/php_8.1-fpm-buster/Dockerfile b/php_8.1-fpm-bullseye/Dockerfile
similarity index 98%
rename from php_8.1-fpm-buster/Dockerfile
rename to php_8.1-fpm-bullseye/Dockerfile
index 45bfb18..b32ad0b 100644
--- a/php_8.1-fpm-buster/Dockerfile
+++ b/php_8.1-fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-fpm-buster/docker-php-entrypoint b/php_8.1-fpm-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.1-fpm-buster/docker-php-entrypoint
rename to php_8.1-fpm-bullseye/docker-php-entrypoint
diff --git a/php_8.1-fpm-buster/docker-php-ext-configure b/php_8.1-fpm-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.1-fpm-buster/docker-php-ext-configure
rename to php_8.1-fpm-bullseye/docker-php-ext-configure
diff --git a/php_8.1-fpm-buster/docker-php-ext-enable b/php_8.1-fpm-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.1-fpm-buster/docker-php-ext-enable
rename to php_8.1-fpm-bullseye/docker-php-ext-enable
diff --git a/php_8.1-fpm-buster/docker-php-ext-install b/php_8.1-fpm-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.1-fpm-buster/docker-php-ext-install
rename to php_8.1-fpm-bullseye/docker-php-ext-install
diff --git a/php_8.1-fpm-buster/docker-php-source b/php_8.1-fpm-bullseye/docker-php-source
similarity index 100%
rename from php_8.1-fpm-buster/docker-php-source
rename to php_8.1-fpm-bullseye/docker-php-source
diff --git a/php_8.1-fpm/Dockerfile b/php_8.1-fpm/Dockerfile
index a35873d..cffdade 100644
--- a/php_8.1-fpm/Dockerfile
+++ b/php_8.1-fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine/Dockerfile
index 843928e..929f1bf 100644
--- a/php_8.1-zts-alpine/Dockerfile
+++ b/php_8.1-zts-alpine/Dockerfile
@@ -168,6 +168,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.1-zts-alpine3.16/Dockerfile b/php_8.1-zts-alpine3.16/Dockerfile
index 5940300..53e677e 100644
--- a/php_8.1-zts-alpine3.16/Dockerfile
+++ b/php_8.1-zts-alpine3.16/Dockerfile
@@ -168,6 +168,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.1-zts-alpine3.17/Dockerfile b/php_8.1-zts-alpine3.17/Dockerfile
index f8b17f2..19ceb36 100644
--- a/php_8.1-zts-alpine3.17/Dockerfile
+++ b/php_8.1-zts-alpine3.17/Dockerfile
@@ -168,6 +168,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_8.1-zts-buster/Dockerfile b/php_8.1-zts-bullseye/Dockerfile
similarity index 97%
rename from php_8.1-zts-buster/Dockerfile
rename to php_8.1-zts-bullseye/Dockerfile
index 6cf7d9b..39496db 100644
--- a/php_8.1-zts-buster/Dockerfile
+++ b/php_8.1-zts-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -179,6 +179,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
@@ -203,7 +204,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1-zts-buster/docker-php-entrypoint b/php_8.1-zts-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.1-zts-buster/docker-php-entrypoint
rename to php_8.1-zts-bullseye/docker-php-entrypoint
diff --git a/php_8.1-zts-buster/docker-php-ext-configure b/php_8.1-zts-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.1-zts-buster/docker-php-ext-configure
rename to php_8.1-zts-bullseye/docker-php-ext-configure
diff --git a/php_8.1-zts-buster/docker-php-ext-enable b/php_8.1-zts-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.1-zts-buster/docker-php-ext-enable
rename to php_8.1-zts-bullseye/docker-php-ext-enable
diff --git a/php_8.1-zts-buster/docker-php-ext-install b/php_8.1-zts-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.1-zts-buster/docker-php-ext-install
rename to php_8.1-zts-bullseye/docker-php-ext-install
diff --git a/php_8.1-zts-buster/docker-php-source b/php_8.1-zts-bullseye/docker-php-source
similarity index 100%
rename from php_8.1-zts-buster/docker-php-source
rename to php_8.1-zts-bullseye/docker-php-source
diff --git a/php_8.1-zts/Dockerfile b/php_8.1-zts/Dockerfile
index 88d06e4..054700e 100644
--- a/php_8.1-zts/Dockerfile
+++ b/php_8.1-zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -179,6 +179,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
@@ -203,7 +204,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.1/Dockerfile b/php_8.1/Dockerfile
index 33699cc..9f95d7c 100644
--- a/php_8.1/Dockerfile
+++ b/php_8.1/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-apache-buster/Dockerfile b/php_8.3-rc-apache-bullseye/Dockerfile
similarity index 98%
rename from php_8.3-rc-apache-buster/Dockerfile
rename to php_8.3-rc-apache-bullseye/Dockerfile
index db62a32..2a5c875 100644
--- a/php_8.3-rc-apache-buster/Dockerfile
+++ b/php_8.3-rc-apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-apache-buster/apache2-foreground b/php_8.3-rc-apache-bullseye/apache2-foreground
similarity index 100%
rename from php_8.3-rc-apache-buster/apache2-foreground
rename to php_8.3-rc-apache-bullseye/apache2-foreground
diff --git a/php_8.3-rc-apache-buster/docker-php-entrypoint b/php_8.3-rc-apache-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-apache-buster/docker-php-entrypoint
rename to php_8.3-rc-apache-bullseye/docker-php-entrypoint
diff --git a/php_8.3-rc-apache-buster/docker-php-ext-configure b/php_8.3-rc-apache-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-apache-buster/docker-php-ext-configure
rename to php_8.3-rc-apache-bullseye/docker-php-ext-configure
diff --git a/php_8.3-rc-apache-buster/docker-php-ext-enable b/php_8.3-rc-apache-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-apache-buster/docker-php-ext-enable
rename to php_8.3-rc-apache-bullseye/docker-php-ext-enable
diff --git a/php_8.3-rc-apache-buster/docker-php-ext-install b/php_8.3-rc-apache-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-apache-buster/docker-php-ext-install
rename to php_8.3-rc-apache-bullseye/docker-php-ext-install
diff --git a/php_8.3-rc-apache-buster/docker-php-source b/php_8.3-rc-apache-bullseye/docker-php-source
similarity index 100%
rename from php_8.3-rc-apache-buster/docker-php-source
rename to php_8.3-rc-apache-bullseye/docker-php-source
diff --git a/php_8.3-rc-apache/Dockerfile b/php_8.3-rc-apache/Dockerfile
index caea0b5..1e5c199 100644
--- a/php_8.3-rc-apache/Dockerfile
+++ b/php_8.3-rc-apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-buster/Dockerfile b/php_8.3-rc-bullseye/Dockerfile
similarity index 98%
rename from php_8.3-rc-buster/Dockerfile
rename to php_8.3-rc-bullseye/Dockerfile
index 87cd35d..631d311 100644
--- a/php_8.3-rc-buster/Dockerfile
+++ b/php_8.3-rc-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-buster/docker-php-entrypoint b/php_8.3-rc-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-buster/docker-php-entrypoint
rename to php_8.3-rc-bullseye/docker-php-entrypoint
diff --git a/php_8.3-rc-buster/docker-php-ext-configure b/php_8.3-rc-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-buster/docker-php-ext-configure
rename to php_8.3-rc-bullseye/docker-php-ext-configure
diff --git a/php_8.3-rc-buster/docker-php-ext-enable b/php_8.3-rc-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-buster/docker-php-ext-enable
rename to php_8.3-rc-bullseye/docker-php-ext-enable
diff --git a/php_8.3-rc-buster/docker-php-ext-install b/php_8.3-rc-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-buster/docker-php-ext-install
rename to php_8.3-rc-bullseye/docker-php-ext-install
diff --git a/php_8.3-rc-buster/docker-php-source b/php_8.3-rc-bullseye/docker-php-source
similarity index 100%
rename from php_8.3-rc-buster/docker-php-source
rename to php_8.3-rc-bullseye/docker-php-source
diff --git a/php_8.3-rc-fpm-buster/Dockerfile b/php_8.3-rc-fpm-bullseye/Dockerfile
similarity index 98%
rename from php_8.3-rc-fpm-buster/Dockerfile
rename to php_8.3-rc-fpm-bullseye/Dockerfile
index 3c040c2..320f6e8 100644
--- a/php_8.3-rc-fpm-buster/Dockerfile
+++ b/php_8.3-rc-fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-fpm-buster/docker-php-entrypoint b/php_8.3-rc-fpm-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-fpm-buster/docker-php-entrypoint
rename to php_8.3-rc-fpm-bullseye/docker-php-entrypoint
diff --git a/php_8.3-rc-fpm-buster/docker-php-ext-configure b/php_8.3-rc-fpm-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-fpm-buster/docker-php-ext-configure
rename to php_8.3-rc-fpm-bullseye/docker-php-ext-configure
diff --git a/php_8.3-rc-fpm-buster/docker-php-ext-enable b/php_8.3-rc-fpm-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-fpm-buster/docker-php-ext-enable
rename to php_8.3-rc-fpm-bullseye/docker-php-ext-enable
diff --git a/php_8.3-rc-fpm-buster/docker-php-ext-install b/php_8.3-rc-fpm-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-fpm-buster/docker-php-ext-install
rename to php_8.3-rc-fpm-bullseye/docker-php-ext-install
diff --git a/php_8.3-rc-fpm-buster/docker-php-source b/php_8.3-rc-fpm-bullseye/docker-php-source
similarity index 100%
rename from php_8.3-rc-fpm-buster/docker-php-source
rename to php_8.3-rc-fpm-bullseye/docker-php-source
diff --git a/php_8.3-rc-fpm/Dockerfile b/php_8.3-rc-fpm/Dockerfile
index fbf2291..78b139a 100644
--- a/php_8.3-rc-fpm/Dockerfile
+++ b/php_8.3-rc-fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-zts-buster/Dockerfile b/php_8.3-rc-zts-bullseye/Dockerfile
similarity index 98%
rename from php_8.3-rc-zts-buster/Dockerfile
rename to php_8.3-rc-zts-bullseye/Dockerfile
index b9bd41d..a88fec5 100644
--- a/php_8.3-rc-zts-buster/Dockerfile
+++ b/php_8.3-rc-zts-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -203,7 +203,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc-zts-buster/docker-php-entrypoint b/php_8.3-rc-zts-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_8.3-rc-zts-buster/docker-php-entrypoint
rename to php_8.3-rc-zts-bullseye/docker-php-entrypoint
diff --git a/php_8.3-rc-zts-buster/docker-php-ext-configure b/php_8.3-rc-zts-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_8.3-rc-zts-buster/docker-php-ext-configure
rename to php_8.3-rc-zts-bullseye/docker-php-ext-configure
diff --git a/php_8.3-rc-zts-buster/docker-php-ext-enable b/php_8.3-rc-zts-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_8.3-rc-zts-buster/docker-php-ext-enable
rename to php_8.3-rc-zts-bullseye/docker-php-ext-enable
diff --git a/php_8.3-rc-zts-buster/docker-php-ext-install b/php_8.3-rc-zts-bullseye/docker-php-ext-install
similarity index 100%
rename from php_8.3-rc-zts-buster/docker-php-ext-install
rename to php_8.3-rc-zts-bullseye/docker-php-ext-install
diff --git a/php_8.3-rc-zts-buster/docker-php-source b/php_8.3-rc-zts-bullseye/docker-php-source
similarity index 100%
rename from php_8.3-rc-zts-buster/docker-php-source
rename to php_8.3-rc-zts-bullseye/docker-php-source
diff --git a/php_8.3-rc-zts/Dockerfile b/php_8.3-rc-zts/Dockerfile
index 4ca70ce..fcd0de1 100644
--- a/php_8.3-rc-zts/Dockerfile
+++ b/php_8.3-rc-zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -203,7 +203,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_8.3-rc/Dockerfile b/php_8.3-rc/Dockerfile
index c16f2fb..f80607c 100644
--- a/php_8.3-rc/Dockerfile
+++ b/php_8.3-rc/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_apache-buster/Dockerfile b/php_apache-bullseye/Dockerfile
similarity index 98%
rename from php_apache-buster/Dockerfile
rename to php_apache-bullseye/Dockerfile
index 6e39002..b5fcf0b 100644
--- a/php_apache-buster/Dockerfile
+++ b/php_apache-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_apache-buster/apache2-foreground b/php_apache-bullseye/apache2-foreground
similarity index 100%
rename from php_apache-buster/apache2-foreground
rename to php_apache-bullseye/apache2-foreground
diff --git a/php_apache-buster/docker-php-entrypoint b/php_apache-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_apache-buster/docker-php-entrypoint
rename to php_apache-bullseye/docker-php-entrypoint
diff --git a/php_apache-buster/docker-php-ext-configure b/php_apache-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_apache-buster/docker-php-ext-configure
rename to php_apache-bullseye/docker-php-ext-configure
diff --git a/php_apache-buster/docker-php-ext-enable b/php_apache-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_apache-buster/docker-php-ext-enable
rename to php_apache-bullseye/docker-php-ext-enable
diff --git a/php_apache-buster/docker-php-ext-install b/php_apache-bullseye/docker-php-ext-install
similarity index 100%
rename from php_apache-buster/docker-php-ext-install
rename to php_apache-bullseye/docker-php-ext-install
diff --git a/php_apache-buster/docker-php-source b/php_apache-bullseye/docker-php-source
similarity index 100%
rename from php_apache-buster/docker-php-source
rename to php_apache-bullseye/docker-php-source
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index c44dfb2..abf83be 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -257,7 +257,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_buster/Dockerfile b/php_bullseye/Dockerfile
similarity index 98%
rename from php_buster/Dockerfile
rename to php_bullseye/Dockerfile
index 13960ea..8fcc1fd 100644
--- a/php_buster/Dockerfile
+++ b/php_bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_buster/docker-php-entrypoint b/php_bullseye/docker-php-entrypoint
similarity index 100%
rename from php_buster/docker-php-entrypoint
rename to php_bullseye/docker-php-entrypoint
diff --git a/php_buster/docker-php-ext-configure b/php_bullseye/docker-php-ext-configure
similarity index 100%
rename from php_buster/docker-php-ext-configure
rename to php_bullseye/docker-php-ext-configure
diff --git a/php_buster/docker-php-ext-enable b/php_bullseye/docker-php-ext-enable
similarity index 100%
rename from php_buster/docker-php-ext-enable
rename to php_bullseye/docker-php-ext-enable
diff --git a/php_buster/docker-php-ext-install b/php_bullseye/docker-php-ext-install
similarity index 100%
rename from php_buster/docker-php-ext-install
rename to php_bullseye/docker-php-ext-install
diff --git a/php_buster/docker-php-source b/php_bullseye/docker-php-source
similarity index 100%
rename from php_buster/docker-php-source
rename to php_bullseye/docker-php-source
diff --git a/php_fpm-buster/Dockerfile b/php_fpm-bullseye/Dockerfile
similarity index 98%
rename from php_fpm-buster/Dockerfile
rename to php_fpm-bullseye/Dockerfile
index c0d17a7..383936c 100644
--- a/php_fpm-buster/Dockerfile
+++ b/php_fpm-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_fpm-buster/docker-php-entrypoint b/php_fpm-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_fpm-buster/docker-php-entrypoint
rename to php_fpm-bullseye/docker-php-entrypoint
diff --git a/php_fpm-buster/docker-php-ext-configure b/php_fpm-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_fpm-buster/docker-php-ext-configure
rename to php_fpm-bullseye/docker-php-ext-configure
diff --git a/php_fpm-buster/docker-php-ext-enable b/php_fpm-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_fpm-buster/docker-php-ext-enable
rename to php_fpm-bullseye/docker-php-ext-enable
diff --git a/php_fpm-buster/docker-php-ext-install b/php_fpm-bullseye/docker-php-ext-install
similarity index 100%
rename from php_fpm-buster/docker-php-ext-install
rename to php_fpm-bullseye/docker-php-ext-install
diff --git a/php_fpm-buster/docker-php-source b/php_fpm-bullseye/docker-php-source
similarity index 100%
rename from php_fpm-buster/docker-php-source
rename to php_fpm-bullseye/docker-php-source
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index 1c78f72..7524d77 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -200,7 +200,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index 86a7209..9a44738 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -198,7 +198,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index 97bbcc0..61a215a 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -168,6 +168,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_zts-alpine3.17/Dockerfile b/php_zts-alpine3.17/Dockerfile
index 047115b..cf5742f 100644
--- a/php_zts-alpine3.17/Dockerfile
+++ b/php_zts-alpine3.17/Dockerfile
@@ -168,6 +168,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
diff --git a/php_zts-buster/Dockerfile b/php_zts-bullseye/Dockerfile
similarity index 97%
rename from php_zts-buster/Dockerfile
rename to php_zts-bullseye/Dockerfile
index 076b800..99d1567 100644
--- a/php_zts-buster/Dockerfile
+++ b/php_zts-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bullseye-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -179,6 +179,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
@@ -203,7 +204,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/php_zts-buster/docker-php-entrypoint b/php_zts-bullseye/docker-php-entrypoint
similarity index 100%
rename from php_zts-buster/docker-php-entrypoint
rename to php_zts-bullseye/docker-php-entrypoint
diff --git a/php_zts-buster/docker-php-ext-configure b/php_zts-bullseye/docker-php-ext-configure
similarity index 100%
rename from php_zts-buster/docker-php-ext-configure
rename to php_zts-bullseye/docker-php-ext-configure
diff --git a/php_zts-buster/docker-php-ext-enable b/php_zts-bullseye/docker-php-ext-enable
similarity index 100%
rename from php_zts-buster/docker-php-ext-enable
rename to php_zts-bullseye/docker-php-ext-enable
diff --git a/php_zts-buster/docker-php-ext-install b/php_zts-bullseye/docker-php-ext-install
similarity index 100%
rename from php_zts-buster/docker-php-ext-install
rename to php_zts-bullseye/docker-php-ext-install
diff --git a/php_zts-buster/docker-php-source b/php_zts-bullseye/docker-php-source
similarity index 100%
rename from php_zts-buster/docker-php-source
rename to php_zts-bullseye/docker-php-source
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index 1637dcb..ecfc92f 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -179,6 +179,7 @@ RUN set -eux; \
--enable-zts \
# https://externals.io/message/118859
--disable-zend-signals \
+ --enable-zend-max-execution-timers \
; \
make -j "$(nproc)"; \
find -type f -name '*.a' -delete; \
@@ -203,7 +204,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: