Update php #19660
Merged
Update php #19660
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
Changes: - docker-library/php@2ab91e25: Merge pull request docker-library/php#1596 from endelwar/trixie - docker-library/php@686f9529: Add Debian Trixie (and remove Bullseye)
Diff for 184d023:diff --git a/_bashbrew-cat b/_bashbrew-cat
index f537c2e..97cebdd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/php.git
-Tags: 8.1.33-apache-bookworm, 8.1-apache-bookworm, 8.1.33-apache, 8.1-apache
+Tags: 8.1.33-apache-bookworm, 8.1-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.1/bookworm/apache
-Tags: 8.1.33-apache-bullseye, 8.1-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.1/bullseye/apache
+Tags: 8.1.33-apache-trixie, 8.1-apache-trixie, 8.1.33-apache, 8.1-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.1/trixie/apache
Tags: 8.1.33-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.33-alpine3.21, 8.1-alpine3.21, 8.1.33-cli-alpine, 8.1-cli-alpine, 8.1.33-alpine, 8.1-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -21,15 +21,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
Directory: 8.1/alpine3.22/cli
-Tags: 8.1.33-cli-bookworm, 8.1-cli-bookworm, 8.1.33-bookworm, 8.1-bookworm, 8.1.33-cli, 8.1-cli, 8.1.33, 8.1
+Tags: 8.1.33-cli-bookworm, 8.1-cli-bookworm, 8.1.33-bookworm, 8.1-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.1/bookworm/cli
-Tags: 8.1.33-cli-bullseye, 8.1-cli-bullseye, 8.1.33-bullseye, 8.1-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.1/bullseye/cli
+Tags: 8.1.33-cli-trixie, 8.1-cli-trixie, 8.1.33-trixie, 8.1-trixie, 8.1.33-cli, 8.1-cli, 8.1.33, 8.1
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.1/trixie/cli
Tags: 8.1.33-fpm-alpine3.21, 8.1-fpm-alpine3.21, 8.1.33-fpm-alpine, 8.1-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -41,15 +41,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
Directory: 8.1/alpine3.22/fpm
-Tags: 8.1.33-fpm-bookworm, 8.1-fpm-bookworm, 8.1.33-fpm, 8.1-fpm
+Tags: 8.1.33-fpm-bookworm, 8.1-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.1/bookworm/fpm
-Tags: 8.1.33-fpm-bullseye, 8.1-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.1/bullseye/fpm
+Tags: 8.1.33-fpm-trixie, 8.1-fpm-trixie, 8.1.33-fpm, 8.1-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.1/trixie/fpm
Tags: 8.1.33-zts-alpine3.21, 8.1-zts-alpine3.21, 8.1.33-zts-alpine, 8.1-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -61,25 +61,25 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
Directory: 8.1/alpine3.22/zts
-Tags: 8.1.33-zts-bookworm, 8.1-zts-bookworm, 8.1.33-zts, 8.1-zts
+Tags: 8.1.33-zts-bookworm, 8.1-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.1/bookworm/zts
-Tags: 8.1.33-zts-bullseye, 8.1-zts-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.1/bullseye/zts
+Tags: 8.1.33-zts-trixie, 8.1-zts-trixie, 8.1.33-zts, 8.1-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.1/trixie/zts
-Tags: 8.2.29-apache-bookworm, 8.2-apache-bookworm, 8.2.29-apache, 8.2-apache
+Tags: 8.2.29-apache-bookworm, 8.2-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.2/bookworm/apache
-Tags: 8.2.29-apache-bullseye, 8.2-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.2/bullseye/apache
+Tags: 8.2.29-apache-trixie, 8.2-apache-trixie, 8.2.29-apache, 8.2-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.2/trixie/apache
Tags: 8.2.29-cli-alpine3.21, 8.2-cli-alpine3.21, 8.2.29-alpine3.21, 8.2-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -91,15 +91,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
Directory: 8.2/alpine3.22/cli
-Tags: 8.2.29-cli-bookworm, 8.2-cli-bookworm, 8.2.29-bookworm, 8.2-bookworm, 8.2.29-cli, 8.2-cli, 8.2.29, 8.2
+Tags: 8.2.29-cli-bookworm, 8.2-cli-bookworm, 8.2.29-bookworm, 8.2-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.2/bookworm/cli
-Tags: 8.2.29-cli-bullseye, 8.2-cli-bullseye, 8.2.29-bullseye, 8.2-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.2/bullseye/cli
+Tags: 8.2.29-cli-trixie, 8.2-cli-trixie, 8.2.29-trixie, 8.2-trixie, 8.2.29-cli, 8.2-cli, 8.2.29, 8.2
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.2/trixie/cli
Tags: 8.2.29-fpm-alpine3.21, 8.2-fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -111,15 +111,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
Directory: 8.2/alpine3.22/fpm
-Tags: 8.2.29-fpm-bookworm, 8.2-fpm-bookworm, 8.2.29-fpm, 8.2-fpm
+Tags: 8.2.29-fpm-bookworm, 8.2-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.2/bookworm/fpm
-Tags: 8.2.29-fpm-bullseye, 8.2-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.2/bullseye/fpm
+Tags: 8.2.29-fpm-trixie, 8.2-fpm-trixie, 8.2.29-fpm, 8.2-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.2/trixie/fpm
Tags: 8.2.29-zts-alpine3.21, 8.2-zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -131,25 +131,25 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
Directory: 8.2/alpine3.22/zts
-Tags: 8.2.29-zts-bookworm, 8.2-zts-bookworm, 8.2.29-zts, 8.2-zts
+Tags: 8.2.29-zts-bookworm, 8.2-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.2/bookworm/zts
-Tags: 8.2.29-zts-bullseye, 8.2-zts-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
-Directory: 8.2/bullseye/zts
+Tags: 8.2.29-zts-trixie, 8.2-zts-trixie, 8.2.29-zts, 8.2-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.2/trixie/zts
-Tags: 8.3.24-apache-bookworm, 8.3-apache-bookworm, 8.3.24-apache, 8.3-apache
+Tags: 8.3.24-apache-bookworm, 8.3-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.3/bookworm/apache
-Tags: 8.3.24-apache-bullseye, 8.3-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
-Directory: 8.3/bullseye/apache
+Tags: 8.3.24-apache-trixie, 8.3-apache-trixie, 8.3.24-apache, 8.3-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.3/trixie/apache
Tags: 8.3.24-cli-alpine3.21, 8.3-cli-alpine3.21, 8.3.24-alpine3.21, 8.3-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -161,15 +161,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
Directory: 8.3/alpine3.22/cli
-Tags: 8.3.24-cli-bookworm, 8.3-cli-bookworm, 8.3.24-bookworm, 8.3-bookworm, 8.3.24-cli, 8.3-cli, 8.3.24, 8.3
+Tags: 8.3.24-cli-bookworm, 8.3-cli-bookworm, 8.3.24-bookworm, 8.3-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.3/bookworm/cli
-Tags: 8.3.24-cli-bullseye, 8.3-cli-bullseye, 8.3.24-bullseye, 8.3-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
-Directory: 8.3/bullseye/cli
+Tags: 8.3.24-cli-trixie, 8.3-cli-trixie, 8.3.24-trixie, 8.3-trixie, 8.3.24-cli, 8.3-cli, 8.3.24, 8.3
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.3/trixie/cli
Tags: 8.3.24-fpm-alpine3.21, 8.3-fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -181,15 +181,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
Directory: 8.3/alpine3.22/fpm
-Tags: 8.3.24-fpm-bookworm, 8.3-fpm-bookworm, 8.3.24-fpm, 8.3-fpm
+Tags: 8.3.24-fpm-bookworm, 8.3-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.3/bookworm/fpm
-Tags: 8.3.24-fpm-bullseye, 8.3-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
-Directory: 8.3/bullseye/fpm
+Tags: 8.3.24-fpm-trixie, 8.3-fpm-trixie, 8.3.24-fpm, 8.3-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.3/trixie/fpm
Tags: 8.3.24-zts-alpine3.21, 8.3-zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -201,25 +201,25 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
Directory: 8.3/alpine3.22/zts
-Tags: 8.3.24-zts-bookworm, 8.3-zts-bookworm, 8.3.24-zts, 8.3-zts
+Tags: 8.3.24-zts-bookworm, 8.3-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.3/bookworm/zts
-Tags: 8.3.24-zts-bullseye, 8.3-zts-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 092d7bdebba2a4e204a349280e54a59f78cfc327
-Directory: 8.3/bullseye/zts
+Tags: 8.3.24-zts-trixie, 8.3-zts-trixie, 8.3.24-zts, 8.3-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.3/trixie/zts
-Tags: 8.4.11-apache-bookworm, 8.4-apache-bookworm, 8-apache-bookworm, apache-bookworm, 8.4.11-apache, 8.4-apache, 8-apache, apache
+Tags: 8.4.11-apache-bookworm, 8.4-apache-bookworm, 8-apache-bookworm, apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.4/bookworm/apache
-Tags: 8.4.11-apache-bullseye, 8.4-apache-bullseye, 8-apache-bullseye, apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
-Directory: 8.4/bullseye/apache
+Tags: 8.4.11-apache-trixie, 8.4-apache-trixie, 8-apache-trixie, apache-trixie, 8.4.11-apache, 8.4-apache, 8-apache, apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.4/trixie/apache
Tags: 8.4.11-cli-alpine3.21, 8.4-cli-alpine3.21, 8-cli-alpine3.21, cli-alpine3.21, 8.4.11-alpine3.21, 8.4-alpine3.21, 8-alpine3.21, alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -231,15 +231,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
Directory: 8.4/alpine3.22/cli
-Tags: 8.4.11-cli-bookworm, 8.4-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.4.11-bookworm, 8.4-bookworm, 8-bookworm, bookworm, 8.4.11-cli, 8.4-cli, 8-cli, cli, 8.4.11, 8.4, 8, latest
+Tags: 8.4.11-cli-bookworm, 8.4-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.4.11-bookworm, 8.4-bookworm, 8-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.4/bookworm/cli
-Tags: 8.4.11-cli-bullseye, 8.4-cli-bullseye, 8-cli-bullseye, cli-bullseye, 8.4.11-bullseye, 8.4-bullseye, 8-bullseye, bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
-Directory: 8.4/bullseye/cli
+Tags: 8.4.11-cli-trixie, 8.4-cli-trixie, 8-cli-trixie, cli-trixie, 8.4.11-trixie, 8.4-trixie, 8-trixie, trixie, 8.4.11-cli, 8.4-cli, 8-cli, cli, 8.4.11, 8.4, 8, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.4/trixie/cli
Tags: 8.4.11-fpm-alpine3.21, 8.4-fpm-alpine3.21, 8-fpm-alpine3.21, fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -251,15 +251,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
Directory: 8.4/alpine3.22/fpm
-Tags: 8.4.11-fpm-bookworm, 8.4-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm, 8.4.11-fpm, 8.4-fpm, 8-fpm, fpm
+Tags: 8.4.11-fpm-bookworm, 8.4-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.4/bookworm/fpm
-Tags: 8.4.11-fpm-bullseye, 8.4-fpm-bullseye, 8-fpm-bullseye, fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
-Directory: 8.4/bullseye/fpm
+Tags: 8.4.11-fpm-trixie, 8.4-fpm-trixie, 8-fpm-trixie, fpm-trixie, 8.4.11-fpm, 8.4-fpm, 8-fpm, fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.4/trixie/fpm
Tags: 8.4.11-zts-alpine3.21, 8.4-zts-alpine3.21, 8-zts-alpine3.21, zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -271,25 +271,25 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
Directory: 8.4/alpine3.22/zts
-Tags: 8.4.11-zts-bookworm, 8.4-zts-bookworm, 8-zts-bookworm, zts-bookworm, 8.4.11-zts, 8.4-zts, 8-zts, zts
+Tags: 8.4.11-zts-bookworm, 8.4-zts-bookworm, 8-zts-bookworm, zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.4/bookworm/zts
-Tags: 8.4.11-zts-bullseye, 8.4-zts-bullseye, 8-zts-bullseye, zts-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 160b04773958930fac297f64be7c2f8e682902d8
-Directory: 8.4/bullseye/zts
+Tags: 8.4.11-zts-trixie, 8.4-zts-trixie, 8-zts-trixie, zts-trixie, 8.4.11-zts, 8.4-zts, 8-zts, zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.4/trixie/zts
-Tags: 8.5.0alpha4-apache-bookworm, 8.5-rc-apache-bookworm, 8.5.0alpha4-apache, 8.5-rc-apache
+Tags: 8.5.0alpha4-apache-bookworm, 8.5-rc-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.5-rc/bookworm/apache
-Tags: 8.5.0alpha4-apache-bullseye, 8.5-rc-apache-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
-Directory: 8.5-rc/bullseye/apache
+Tags: 8.5.0alpha4-apache-trixie, 8.5-rc-apache-trixie, 8.5.0alpha4-apache, 8.5-rc-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.5-rc/trixie/apache
Tags: 8.5.0alpha4-cli-alpine3.21, 8.5-rc-cli-alpine3.21, 8.5.0alpha4-alpine3.21, 8.5-rc-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -301,15 +301,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
Directory: 8.5-rc/alpine3.22/cli
-Tags: 8.5.0alpha4-cli-bookworm, 8.5-rc-cli-bookworm, 8.5.0alpha4-bookworm, 8.5-rc-bookworm, 8.5.0alpha4-cli, 8.5-rc-cli, 8.5.0alpha4, 8.5-rc
+Tags: 8.5.0alpha4-cli-bookworm, 8.5-rc-cli-bookworm, 8.5.0alpha4-bookworm, 8.5-rc-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.5-rc/bookworm/cli
-Tags: 8.5.0alpha4-cli-bullseye, 8.5-rc-cli-bullseye, 8.5.0alpha4-bullseye, 8.5-rc-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
-Directory: 8.5-rc/bullseye/cli
+Tags: 8.5.0alpha4-cli-trixie, 8.5-rc-cli-trixie, 8.5.0alpha4-trixie, 8.5-rc-trixie, 8.5.0alpha4-cli, 8.5-rc-cli, 8.5.0alpha4, 8.5-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.5-rc/trixie/cli
Tags: 8.5.0alpha4-fpm-alpine3.21, 8.5-rc-fpm-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -321,15 +321,15 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
Directory: 8.5-rc/alpine3.22/fpm
-Tags: 8.5.0alpha4-fpm-bookworm, 8.5-rc-fpm-bookworm, 8.5.0alpha4-fpm, 8.5-rc-fpm
+Tags: 8.5.0alpha4-fpm-bookworm, 8.5-rc-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.5-rc/bookworm/fpm
-Tags: 8.5.0alpha4-fpm-bullseye, 8.5-rc-fpm-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
-Directory: 8.5-rc/bullseye/fpm
+Tags: 8.5.0alpha4-fpm-trixie, 8.5-rc-fpm-trixie, 8.5.0alpha4-fpm, 8.5-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.5-rc/trixie/fpm
Tags: 8.5.0alpha4-zts-alpine3.21, 8.5-rc-zts-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
@@ -341,12 +341,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
Directory: 8.5-rc/alpine3.22/zts
-Tags: 8.5.0alpha4-zts-bookworm, 8.5-rc-zts-bookworm, 8.5.0alpha4-zts, 8.5-rc-zts
+Tags: 8.5.0alpha4-zts-bookworm, 8.5-rc-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
Directory: 8.5-rc/bookworm/zts
-Tags: 8.5.0alpha4-zts-bullseye, 8.5-rc-zts-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 5e4e2e22d28daa52566db1270af7b2ae65c6aa37
-Directory: 8.5-rc/bullseye/zts
+Tags: 8.5.0alpha4-zts-trixie, 8.5-rc-zts-trixie, 8.5.0alpha4-zts, 8.5-rc-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+Directory: 8.5-rc/trixie/zts
diff --git a/_bashbrew-list b/_bashbrew-list
index 5913330..3d41fd9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,321 +4,321 @@ php:8-alpine3.21
php:8-alpine3.22
php:8-apache
php:8-apache-bookworm
-php:8-apache-bullseye
+php:8-apache-trixie
php:8-bookworm
-php:8-bullseye
php:8-cli
php:8-cli-alpine
php:8-cli-alpine3.21
php:8-cli-alpine3.22
php:8-cli-bookworm
-php:8-cli-bullseye
+php:8-cli-trixie
php:8-fpm
php:8-fpm-alpine
php:8-fpm-alpine3.21
php:8-fpm-alpine3.22
php:8-fpm-bookworm
-php:8-fpm-bullseye
+php:8-fpm-trixie
+php:8-trixie
php:8-zts
php:8-zts-alpine
php:8-zts-alpine3.21
php:8-zts-alpine3.22
php:8-zts-bookworm
-php:8-zts-bullseye
+php:8-zts-trixie
php:8.1
php:8.1-alpine
php:8.1-alpine3.21
php:8.1-alpine3.22
php:8.1-apache
php:8.1-apache-bookworm
-php:8.1-apache-bullseye
+php:8.1-apache-trixie
php:8.1-bookworm
-php:8.1-bullseye
php:8.1-cli
php:8.1-cli-alpine
php:8.1-cli-alpine3.21
php:8.1-cli-alpine3.22
php:8.1-cli-bookworm
-php:8.1-cli-bullseye
+php:8.1-cli-trixie
php:8.1-fpm
php:8.1-fpm-alpine
php:8.1-fpm-alpine3.21
php:8.1-fpm-alpine3.22
php:8.1-fpm-bookworm
-php:8.1-fpm-bullseye
+php:8.1-fpm-trixie
+php:8.1-trixie
php:8.1-zts
php:8.1-zts-alpine
php:8.1-zts-alpine3.21
php:8.1-zts-alpine3.22
php:8.1-zts-bookworm
-php:8.1-zts-bullseye
+php:8.1-zts-trixie
php:8.1.33
php:8.1.33-alpine
php:8.1.33-alpine3.21
php:8.1.33-alpine3.22
php:8.1.33-apache
php:8.1.33-apache-bookworm
-php:8.1.33-apache-bullseye
+php:8.1.33-apache-trixie
php:8.1.33-bookworm
-php:8.1.33-bullseye
php:8.1.33-cli
php:8.1.33-cli-alpine
php:8.1.33-cli-alpine3.21
php:8.1.33-cli-alpine3.22
php:8.1.33-cli-bookworm
-php:8.1.33-cli-bullseye
+php:8.1.33-cli-trixie
php:8.1.33-fpm
php:8.1.33-fpm-alpine
php:8.1.33-fpm-alpine3.21
php:8.1.33-fpm-alpine3.22
php:8.1.33-fpm-bookworm
-php:8.1.33-fpm-bullseye
+php:8.1.33-fpm-trixie
+php:8.1.33-trixie
php:8.1.33-zts
php:8.1.33-zts-alpine
php:8.1.33-zts-alpine3.21
php:8.1.33-zts-alpine3.22
php:8.1.33-zts-bookworm
-php:8.1.33-zts-bullseye
+php:8.1.33-zts-trixie
php:8.2
php:8.2-alpine
php:8.2-alpine3.21
php:8.2-alpine3.22
php:8.2-apache
php:8.2-apache-bookworm
-php:8.2-apache-bullseye
+php:8.2-apache-trixie
php:8.2-bookworm
-php:8.2-bullseye
php:8.2-cli
php:8.2-cli-alpine
php:8.2-cli-alpine3.21
php:8.2-cli-alpine3.22
php:8.2-cli-bookworm
-php:8.2-cli-bullseye
+php:8.2-cli-trixie
php:8.2-fpm
php:8.2-fpm-alpine
php:8.2-fpm-alpine3.21
php:8.2-fpm-alpine3.22
php:8.2-fpm-bookworm
-php:8.2-fpm-bullseye
+php:8.2-fpm-trixie
+php:8.2-trixie
php:8.2-zts
php:8.2-zts-alpine
php:8.2-zts-alpine3.21
php:8.2-zts-alpine3.22
php:8.2-zts-bookworm
-php:8.2-zts-bullseye
+php:8.2-zts-trixie
php:8.2.29
php:8.2.29-alpine
php:8.2.29-alpine3.21
php:8.2.29-alpine3.22
php:8.2.29-apache
php:8.2.29-apache-bookworm
-php:8.2.29-apache-bullseye
+php:8.2.29-apache-trixie
php:8.2.29-bookworm
-php:8.2.29-bullseye
php:8.2.29-cli
php:8.2.29-cli-alpine
php:8.2.29-cli-alpine3.21
php:8.2.29-cli-alpine3.22
php:8.2.29-cli-bookworm
-php:8.2.29-cli-bullseye
+php:8.2.29-cli-trixie
php:8.2.29-fpm
php:8.2.29-fpm-alpine
php:8.2.29-fpm-alpine3.21
php:8.2.29-fpm-alpine3.22
php:8.2.29-fpm-bookworm
-php:8.2.29-fpm-bullseye
+php:8.2.29-fpm-trixie
+php:8.2.29-trixie
php:8.2.29-zts
php:8.2.29-zts-alpine
php:8.2.29-zts-alpine3.21
php:8.2.29-zts-alpine3.22
php:8.2.29-zts-bookworm
-php:8.2.29-zts-bullseye
+php:8.2.29-zts-trixie
php:8.3
php:8.3-alpine
php:8.3-alpine3.21
php:8.3-alpine3.22
php:8.3-apache
php:8.3-apache-bookworm
-php:8.3-apache-bullseye
+php:8.3-apache-trixie
php:8.3-bookworm
-php:8.3-bullseye
php:8.3-cli
php:8.3-cli-alpine
php:8.3-cli-alpine3.21
php:8.3-cli-alpine3.22
php:8.3-cli-bookworm
-php:8.3-cli-bullseye
+php:8.3-cli-trixie
php:8.3-fpm
php:8.3-fpm-alpine
php:8.3-fpm-alpine3.21
php:8.3-fpm-alpine3.22
php:8.3-fpm-bookworm
-php:8.3-fpm-bullseye
+php:8.3-fpm-trixie
+php:8.3-trixie
php:8.3-zts
php:8.3-zts-alpine
php:8.3-zts-alpine3.21
php:8.3-zts-alpine3.22
php:8.3-zts-bookworm
-php:8.3-zts-bullseye
+php:8.3-zts-trixie
php:8.3.24
php:8.3.24-alpine
php:8.3.24-alpine3.21
php:8.3.24-alpine3.22
php:8.3.24-apache
php:8.3.24-apache-bookworm
-php:8.3.24-apache-bullseye
+php:8.3.24-apache-trixie
php:8.3.24-bookworm
-php:8.3.24-bullseye
php:8.3.24-cli
php:8.3.24-cli-alpine
php:8.3.24-cli-alpine3.21
php:8.3.24-cli-alpine3.22
php:8.3.24-cli-bookworm
-php:8.3.24-cli-bullseye
+php:8.3.24-cli-trixie
php:8.3.24-fpm
php:8.3.24-fpm-alpine
php:8.3.24-fpm-alpine3.21
php:8.3.24-fpm-alpine3.22
php:8.3.24-fpm-bookworm
-php:8.3.24-fpm-bullseye
+php:8.3.24-fpm-trixie
+php:8.3.24-trixie
php:8.3.24-zts
php:8.3.24-zts-alpine
php:8.3.24-zts-alpine3.21
php:8.3.24-zts-alpine3.22
php:8.3.24-zts-bookworm
-php:8.3.24-zts-bullseye
+php:8.3.24-zts-trixie
php:8.4
php:8.4-alpine
php:8.4-alpine3.21
php:8.4-alpine3.22
php:8.4-apache
php:8.4-apache-bookworm
-php:8.4-apache-bullseye
+php:8.4-apache-trixie
php:8.4-bookworm
-php:8.4-bullseye
php:8.4-cli
php:8.4-cli-alpine
php:8.4-cli-alpine3.21
php:8.4-cli-alpine3.22
php:8.4-cli-bookworm
-php:8.4-cli-bullseye
+php:8.4-cli-trixie
php:8.4-fpm
php:8.4-fpm-alpine
php:8.4-fpm-alpine3.21
php:8.4-fpm-alpine3.22
php:8.4-fpm-bookworm
-php:8.4-fpm-bullseye
+php:8.4-fpm-trixie
+php:8.4-trixie
php:8.4-zts
php:8.4-zts-alpine
php:8.4-zts-alpine3.21
php:8.4-zts-alpine3.22
php:8.4-zts-bookworm
-php:8.4-zts-bullseye
+php:8.4-zts-trixie
php:8.4.11
php:8.4.11-alpine
php:8.4.11-alpine3.21
php:8.4.11-alpine3.22
php:8.4.11-apache
php:8.4.11-apache-bookworm
-php:8.4.11-apache-bullseye
+php:8.4.11-apache-trixie
php:8.4.11-bookworm
-php:8.4.11-bullseye
php:8.4.11-cli
php:8.4.11-cli-alpine
php:8.4.11-cli-alpine3.21
php:8.4.11-cli-alpine3.22
php:8.4.11-cli-bookworm
-php:8.4.11-cli-bullseye
+php:8.4.11-cli-trixie
php:8.4.11-fpm
php:8.4.11-fpm-alpine
php:8.4.11-fpm-alpine3.21
php:8.4.11-fpm-alpine3.22
php:8.4.11-fpm-bookworm
-php:8.4.11-fpm-bullseye
+php:8.4.11-fpm-trixie
+php:8.4.11-trixie
php:8.4.11-zts
php:8.4.11-zts-alpine
php:8.4.11-zts-alpine3.21
php:8.4.11-zts-alpine3.22
php:8.4.11-zts-bookworm
-php:8.4.11-zts-bullseye
+php:8.4.11-zts-trixie
php:8.5-rc
php:8.5-rc-alpine
php:8.5-rc-alpine3.21
php:8.5-rc-alpine3.22
php:8.5-rc-apache
php:8.5-rc-apache-bookworm
-php:8.5-rc-apache-bullseye
+php:8.5-rc-apache-trixie
php:8.5-rc-bookworm
-php:8.5-rc-bullseye
php:8.5-rc-cli
php:8.5-rc-cli-alpine
php:8.5-rc-cli-alpine3.21
php:8.5-rc-cli-alpine3.22
php:8.5-rc-cli-bookworm
-php:8.5-rc-cli-bullseye
+php:8.5-rc-cli-trixie
php:8.5-rc-fpm
php:8.5-rc-fpm-alpine
php:8.5-rc-fpm-alpine3.21
php:8.5-rc-fpm-alpine3.22
php:8.5-rc-fpm-bookworm
-php:8.5-rc-fpm-bullseye
+php:8.5-rc-fpm-trixie
+php:8.5-rc-trixie
php:8.5-rc-zts
php:8.5-rc-zts-alpine
php:8.5-rc-zts-alpine3.21
php:8.5-rc-zts-alpine3.22
php:8.5-rc-zts-bookworm
-php:8.5-rc-zts-bullseye
+php:8.5-rc-zts-trixie
php:8.5.0alpha4
php:8.5.0alpha4-alpine
php:8.5.0alpha4-alpine3.21
php:8.5.0alpha4-alpine3.22
php:8.5.0alpha4-apache
php:8.5.0alpha4-apache-bookworm
-php:8.5.0alpha4-apache-bullseye
+php:8.5.0alpha4-apache-trixie
php:8.5.0alpha4-bookworm
-php:8.5.0alpha4-bullseye
php:8.5.0alpha4-cli
php:8.5.0alpha4-cli-alpine
php:8.5.0alpha4-cli-alpine3.21
php:8.5.0alpha4-cli-alpine3.22
php:8.5.0alpha4-cli-bookworm
-php:8.5.0alpha4-cli-bullseye
+php:8.5.0alpha4-cli-trixie
php:8.5.0alpha4-fpm
php:8.5.0alpha4-fpm-alpine
php:8.5.0alpha4-fpm-alpine3.21
php:8.5.0alpha4-fpm-alpine3.22
php:8.5.0alpha4-fpm-bookworm
-php:8.5.0alpha4-fpm-bullseye
+php:8.5.0alpha4-fpm-trixie
+php:8.5.0alpha4-trixie
php:8.5.0alpha4-zts
php:8.5.0alpha4-zts-alpine
php:8.5.0alpha4-zts-alpine3.21
php:8.5.0alpha4-zts-alpine3.22
php:8.5.0alpha4-zts-bookworm
-php:8.5.0alpha4-zts-bullseye
+php:8.5.0alpha4-zts-trixie
php:alpine
php:alpine3.21
php:alpine3.22
php:apache
php:apache-bookworm
-php:apache-bullseye
+php:apache-trixie
php:bookworm
-php:bullseye
php:cli
php:cli-alpine
php:cli-alpine3.21
php:cli-alpine3.22
php:cli-bookworm
-php:cli-bullseye
+php:cli-trixie
php:fpm
php:fpm-alpine
php:fpm-alpine3.21
php:fpm-alpine3.22
php:fpm-bookworm
-php:fpm-bullseye
+php:fpm-trixie
php:latest
+php:trixie
php:zts
php:zts-alpine
php:zts-alpine3.21
php:zts-alpine3.22
php:zts-bookworm
-php:zts-bullseye
+php:zts-trixie
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 2bd2b05..214b84f 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -2,69 +2,69 @@ php:8.1
php:8.1-alpine
php:8.1-alpine3.22
php:8.1-apache
-php:8.1-apache-bullseye
-php:8.1-bullseye
+php:8.1-apache-bookworm
+php:8.1-bookworm
php:8.1-fpm
php:8.1-fpm-alpine
php:8.1-fpm-alpine3.22
-php:8.1-fpm-bullseye
+php:8.1-fpm-bookworm
php:8.1-zts
php:8.1-zts-alpine
php:8.1-zts-alpine3.22
-php:8.1-zts-bullseye
+php:8.1-zts-bookworm
php:8.2
php:8.2-alpine
php:8.2-alpine3.21
php:8.2-apache
-php:8.2-apache-bullseye
-php:8.2-bullseye
+php:8.2-apache-bookworm
+php:8.2-bookworm
php:8.2-fpm
php:8.2-fpm-alpine
php:8.2-fpm-alpine3.21
-php:8.2-fpm-bullseye
+php:8.2-fpm-bookworm
php:8.2-zts
php:8.2-zts-alpine
php:8.2-zts-alpine3.21
-php:8.2-zts-bullseye
+php:8.2-zts-bookworm
php:8.3
php:8.3-alpine
php:8.3-alpine3.21
php:8.3-apache
-php:8.3-apache-bullseye
-php:8.3-bullseye
+php:8.3-apache-bookworm
+php:8.3-bookworm
php:8.3-fpm
php:8.3-fpm-alpine
php:8.3-fpm-alpine3.21
-php:8.3-fpm-bullseye
+php:8.3-fpm-bookworm
php:8.3-zts
php:8.3-zts-alpine
php:8.3-zts-alpine3.21
-php:8.3-zts-bullseye
+php:8.3-zts-bookworm
php:8.5-rc
php:8.5-rc-alpine
php:8.5-rc-alpine3.21
php:8.5-rc-apache
-php:8.5-rc-apache-bullseye
-php:8.5-rc-bullseye
+php:8.5-rc-apache-bookworm
+php:8.5-rc-bookworm
php:8.5-rc-fpm
php:8.5-rc-fpm-alpine
php:8.5-rc-fpm-alpine3.21
-php:8.5-rc-fpm-bullseye
+php:8.5-rc-fpm-bookworm
php:8.5-rc-zts
php:8.5-rc-zts-alpine
php:8.5-rc-zts-alpine3.21
-php:8.5-rc-zts-bullseye
+php:8.5-rc-zts-bookworm
php:alpine
php:alpine3.21
php:apache
-php:apache-bullseye
-php:bullseye
+php:apache-bookworm
+php:bookworm
php:fpm
php:fpm-alpine
php:fpm-alpine3.21
-php:fpm-bullseye
+php:fpm-bookworm
php:latest
php:zts
php:zts-alpine
php:zts-alpine3.21
-php:zts-bullseye
+php:zts-bookworm
diff --git a/php_8.1-apache-bullseye/Dockerfile b/php_8.1-apache-bookworm/Dockerfile
similarity index 95%
rename from php_8.1-apache-bullseye/Dockerfile
rename to php_8.1-apache-bookworm/Dockerfile
index 30faf91..1bb1d46 100644
--- a/php_8.1-apache-bullseye/Dockerfile
+++ b/php_8.1-apache-bookworm/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
@@ -70,6 +70,8 @@ RUN set -eux; \
"$APACHE_LOCK_DIR" \
"$APACHE_RUN_DIR" \
"$APACHE_LOG_DIR" \
+# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
+ "$APACHE_RUN_DIR/socks" \
; do \
rm -rvf "$dir"; \
mkdir -p "$dir"; \
@@ -261,8 +263,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.1-apache-bullseye/apache2-foreground b/php_8.1-apache-bookworm/apache2-foreground
similarity index 100%
rename from php_8.1-apache-bullseye/apache2-foreground
rename to php_8.1-apache-bookworm/apache2-foreground
diff --git a/php_8.1-apache-bullseye/docker-php-entrypoint b/php_8.1-apache-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.1-apache-bullseye/docker-php-entrypoint
rename to php_8.1-apache-bookworm/docker-php-entrypoint
diff --git a/php_8.1-apache-bullseye/docker-php-ext-configure b/php_8.1-apache-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.1-apache-bullseye/docker-php-ext-configure
rename to php_8.1-apache-bookworm/docker-php-ext-configure
diff --git a/php_8.1-apache-bullseye/docker-php-ext-enable b/php_8.1-apache-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.1-apache-bullseye/docker-php-ext-enable
rename to php_8.1-apache-bookworm/docker-php-ext-enable
diff --git a/php_8.1-apache-bullseye/docker-php-ext-install b/php_8.1-apache-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.1-apache-bullseye/docker-php-ext-install
rename to php_8.1-apache-bookworm/docker-php-ext-install
diff --git a/php_8.1-apache-bullseye/docker-php-source b/php_8.1-apache-bookworm/docker-php-source
similarity index 100%
rename from php_8.1-apache-bullseye/docker-php-source
rename to php_8.1-apache-bookworm/docker-php-source
diff --git a/php_8.1-apache/Dockerfile b/php_8.1-apache/Dockerfile
index cc0e01c..a3dfec4 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:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -54,7 +54,7 @@ ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends apache2; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# generically convert lines like
# export APACHE_RUN_USER=www-data
@@ -129,7 +129,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -263,13 +263,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.1-bullseye/Dockerfile b/php_8.1-bookworm/Dockerfile
similarity index 96%
rename from php_8.1-bullseye/Dockerfile
rename to php_8.1-bookworm/Dockerfile
index dee6016..006f194 100644
--- a/php_8.1-bullseye/Dockerfile
+++ b/php_8.1-bookworm/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
@@ -202,8 +202,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.1-bullseye/docker-php-entrypoint b/php_8.1-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.1-bullseye/docker-php-entrypoint
rename to php_8.1-bookworm/docker-php-entrypoint
diff --git a/php_8.1-bullseye/docker-php-ext-configure b/php_8.1-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.1-bullseye/docker-php-ext-configure
rename to php_8.1-bookworm/docker-php-ext-configure
diff --git a/php_8.1-bullseye/docker-php-ext-enable b/php_8.1-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.1-bullseye/docker-php-ext-enable
rename to php_8.1-bookworm/docker-php-ext-enable
diff --git a/php_8.1-bullseye/docker-php-ext-install b/php_8.1-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.1-bullseye/docker-php-ext-install
rename to php_8.1-bookworm/docker-php-ext-install
diff --git a/php_8.1-bullseye/docker-php-source b/php_8.1-bookworm/docker-php-source
similarity index 100%
rename from php_8.1-bullseye/docker-php-source
rename to php_8.1-bookworm/docker-php-source
diff --git a/php_8.1-fpm-bullseye/Dockerfile b/php_8.1-fpm-bookworm/Dockerfile
similarity index 97%
rename from php_8.1-fpm-bullseye/Dockerfile
rename to php_8.1-fpm-bookworm/Dockerfile
index 73f53b4..97421c9 100644
--- a/php_8.1-fpm-bullseye/Dockerfile
+++ b/php_8.1-fpm-bookworm/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
@@ -204,8 +204,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.1-fpm-bullseye/docker-php-entrypoint b/php_8.1-fpm-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.1-fpm-bullseye/docker-php-entrypoint
rename to php_8.1-fpm-bookworm/docker-php-entrypoint
diff --git a/php_8.1-fpm-bullseye/docker-php-ext-configure b/php_8.1-fpm-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.1-fpm-bullseye/docker-php-ext-configure
rename to php_8.1-fpm-bookworm/docker-php-ext-configure
diff --git a/php_8.1-fpm-bullseye/docker-php-ext-enable b/php_8.1-fpm-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.1-fpm-bullseye/docker-php-ext-enable
rename to php_8.1-fpm-bookworm/docker-php-ext-enable
diff --git a/php_8.1-fpm-bullseye/docker-php-ext-install b/php_8.1-fpm-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.1-fpm-bullseye/docker-php-ext-install
rename to php_8.1-fpm-bookworm/docker-php-ext-install
diff --git a/php_8.1-fpm-bullseye/docker-php-source b/php_8.1-fpm-bookworm/docker-php-source
similarity index 100%
rename from php_8.1-fpm-bullseye/docker-php-source
rename to php_8.1-fpm-bookworm/docker-php-source
diff --git a/php_8.1-fpm/Dockerfile b/php_8.1-fpm/Dockerfile
index a31335c..af842f2 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:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -204,13 +204,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.1-zts-bullseye/Dockerfile b/php_8.1-zts-bookworm/Dockerfile
similarity index 96%
rename from php_8.1-zts-bullseye/Dockerfile
rename to php_8.1-zts-bookworm/Dockerfile
index 6b5609e..73e78be 100644
--- a/php_8.1-zts-bullseye/Dockerfile
+++ b/php_8.1-zts-bookworm/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
@@ -207,8 +207,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.1-zts-bullseye/docker-php-entrypoint b/php_8.1-zts-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.1-zts-bullseye/docker-php-entrypoint
rename to php_8.1-zts-bookworm/docker-php-entrypoint
diff --git a/php_8.1-zts-bullseye/docker-php-ext-configure b/php_8.1-zts-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.1-zts-bullseye/docker-php-ext-configure
rename to php_8.1-zts-bookworm/docker-php-ext-configure
diff --git a/php_8.1-zts-bullseye/docker-php-ext-enable b/php_8.1-zts-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.1-zts-bullseye/docker-php-ext-enable
rename to php_8.1-zts-bookworm/docker-php-ext-enable
diff --git a/php_8.1-zts-bullseye/docker-php-ext-install b/php_8.1-zts-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.1-zts-bullseye/docker-php-ext-install
rename to php_8.1-zts-bookworm/docker-php-ext-install
diff --git a/php_8.1-zts-bullseye/docker-php-source b/php_8.1-zts-bookworm/docker-php-source
similarity index 100%
rename from php_8.1-zts-bullseye/docker-php-source
rename to php_8.1-zts-bookworm/docker-php-source
diff --git a/php_8.1-zts/Dockerfile b/php_8.1-zts/Dockerfile
index 010f92f..30e6f4c 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:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -207,13 +207,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.1/Dockerfile b/php_8.1/Dockerfile
index 1dc6ba8..0aa7470 100644
--- a/php_8.1/Dockerfile
+++ b/php_8.1/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -202,13 +202,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.2-apache-bullseye/Dockerfile b/php_8.2-apache-bookworm/Dockerfile
similarity index 95%
rename from php_8.2-apache-bullseye/Dockerfile
rename to php_8.2-apache-bookworm/Dockerfile
index 072427b..49c85c4 100644
--- a/php_8.2-apache-bullseye/Dockerfile
+++ b/php_8.2-apache-bookworm/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
@@ -70,6 +70,8 @@ RUN set -eux; \
"$APACHE_LOCK_DIR" \
"$APACHE_RUN_DIR" \
"$APACHE_LOG_DIR" \
+# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
+ "$APACHE_RUN_DIR/socks" \
; do \
rm -rvf "$dir"; \
mkdir -p "$dir"; \
@@ -259,8 +261,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.2-apache-bullseye/apache2-foreground b/php_8.2-apache-bookworm/apache2-foreground
similarity index 100%
rename from php_8.2-apache-bullseye/apache2-foreground
rename to php_8.2-apache-bookworm/apache2-foreground
diff --git a/php_8.2-apache-bullseye/docker-php-entrypoint b/php_8.2-apache-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.2-apache-bullseye/docker-php-entrypoint
rename to php_8.2-apache-bookworm/docker-php-entrypoint
diff --git a/php_8.2-apache-bullseye/docker-php-ext-configure b/php_8.2-apache-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.2-apache-bullseye/docker-php-ext-configure
rename to php_8.2-apache-bookworm/docker-php-ext-configure
diff --git a/php_8.2-apache-bullseye/docker-php-ext-enable b/php_8.2-apache-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.2-apache-bullseye/docker-php-ext-enable
rename to php_8.2-apache-bookworm/docker-php-ext-enable
diff --git a/php_8.2-apache-bullseye/docker-php-ext-install b/php_8.2-apache-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.2-apache-bullseye/docker-php-ext-install
rename to php_8.2-apache-bookworm/docker-php-ext-install
diff --git a/php_8.2-apache-bullseye/docker-php-source b/php_8.2-apache-bookworm/docker-php-source
similarity index 100%
rename from php_8.2-apache-bullseye/docker-php-source
rename to php_8.2-apache-bookworm/docker-php-source
diff --git a/php_8.2-apache/Dockerfile b/php_8.2-apache/Dockerfile
index 66493fb..c8b3d92 100644
--- a/php_8.2-apache/Dockerfile
+++ b/php_8.2-apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -54,7 +54,7 @@ ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends apache2; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# generically convert lines like
# export APACHE_RUN_USER=www-data
@@ -129,7 +129,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -261,13 +261,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.2-bullseye/Dockerfile b/php_8.2-bookworm/Dockerfile
similarity index 96%
rename from php_8.2-bullseye/Dockerfile
rename to php_8.2-bookworm/Dockerfile
index 65613af..29f7e7b 100644
--- a/php_8.2-bullseye/Dockerfile
+++ b/php_8.2-bookworm/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,8 +200,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.2-bullseye/docker-php-entrypoint b/php_8.2-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.2-bullseye/docker-php-entrypoint
rename to php_8.2-bookworm/docker-php-entrypoint
diff --git a/php_8.2-bullseye/docker-php-ext-configure b/php_8.2-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.2-bullseye/docker-php-ext-configure
rename to php_8.2-bookworm/docker-php-ext-configure
diff --git a/php_8.2-bullseye/docker-php-ext-enable b/php_8.2-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.2-bullseye/docker-php-ext-enable
rename to php_8.2-bookworm/docker-php-ext-enable
diff --git a/php_8.2-bullseye/docker-php-ext-install b/php_8.2-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.2-bullseye/docker-php-ext-install
rename to php_8.2-bookworm/docker-php-ext-install
diff --git a/php_8.2-bullseye/docker-php-source b/php_8.2-bookworm/docker-php-source
similarity index 100%
rename from php_8.2-bullseye/docker-php-source
rename to php_8.2-bookworm/docker-php-source
diff --git a/php_8.2-fpm-bullseye/Dockerfile b/php_8.2-fpm-bookworm/Dockerfile
similarity index 97%
rename from php_8.2-fpm-bullseye/Dockerfile
rename to php_8.2-fpm-bookworm/Dockerfile
index 9dd27cc..124f4be 100644
--- a/php_8.2-fpm-bullseye/Dockerfile
+++ b/php_8.2-fpm-bookworm/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
@@ -202,8 +202,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.2-fpm-bullseye/docker-php-entrypoint b/php_8.2-fpm-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.2-fpm-bullseye/docker-php-entrypoint
rename to php_8.2-fpm-bookworm/docker-php-entrypoint
diff --git a/php_8.2-fpm-bullseye/docker-php-ext-configure b/php_8.2-fpm-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.2-fpm-bullseye/docker-php-ext-configure
rename to php_8.2-fpm-bookworm/docker-php-ext-configure
diff --git a/php_8.2-fpm-bullseye/docker-php-ext-enable b/php_8.2-fpm-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.2-fpm-bullseye/docker-php-ext-enable
rename to php_8.2-fpm-bookworm/docker-php-ext-enable
diff --git a/php_8.2-fpm-bullseye/docker-php-ext-install b/php_8.2-fpm-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.2-fpm-bullseye/docker-php-ext-install
rename to php_8.2-fpm-bookworm/docker-php-ext-install
diff --git a/php_8.2-fpm-bullseye/docker-php-source b/php_8.2-fpm-bookworm/docker-php-source
similarity index 100%
rename from php_8.2-fpm-bullseye/docker-php-source
rename to php_8.2-fpm-bookworm/docker-php-source
diff --git a/php_8.2-fpm/Dockerfile b/php_8.2-fpm/Dockerfile
index dc2032f..1fc0a9d 100644
--- a/php_8.2-fpm/Dockerfile
+++ b/php_8.2-fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -202,13 +202,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.2-zts-bullseye/Dockerfile b/php_8.2-zts-bookworm/Dockerfile
similarity index 96%
rename from php_8.2-zts-bullseye/Dockerfile
rename to php_8.2-zts-bookworm/Dockerfile
index c7eb4df..88d124f 100644
--- a/php_8.2-zts-bullseye/Dockerfile
+++ b/php_8.2-zts-bookworm/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
@@ -205,8 +205,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.2-zts-bullseye/docker-php-entrypoint b/php_8.2-zts-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.2-zts-bullseye/docker-php-entrypoint
rename to php_8.2-zts-bookworm/docker-php-entrypoint
diff --git a/php_8.2-zts-bullseye/docker-php-ext-configure b/php_8.2-zts-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.2-zts-bullseye/docker-php-ext-configure
rename to php_8.2-zts-bookworm/docker-php-ext-configure
diff --git a/php_8.2-zts-bullseye/docker-php-ext-enable b/php_8.2-zts-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.2-zts-bullseye/docker-php-ext-enable
rename to php_8.2-zts-bookworm/docker-php-ext-enable
diff --git a/php_8.2-zts-bullseye/docker-php-ext-install b/php_8.2-zts-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.2-zts-bullseye/docker-php-ext-install
rename to php_8.2-zts-bookworm/docker-php-ext-install
diff --git a/php_8.2-zts-bullseye/docker-php-source b/php_8.2-zts-bookworm/docker-php-source
similarity index 100%
rename from php_8.2-zts-bullseye/docker-php-source
rename to php_8.2-zts-bookworm/docker-php-source
diff --git a/php_8.2-zts/Dockerfile b/php_8.2-zts/Dockerfile
index d61c7c4..acbc0c9 100644
--- a/php_8.2-zts/Dockerfile
+++ b/php_8.2-zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -205,13 +205,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.2/Dockerfile b/php_8.2/Dockerfile
index d643dbd..8d3f55e 100644
--- a/php_8.2/Dockerfile
+++ b/php_8.2/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -200,13 +200,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.3-apache-bullseye/Dockerfile b/php_8.3-apache-bookworm/Dockerfile
similarity index 95%
rename from php_8.3-apache-bullseye/Dockerfile
rename to php_8.3-apache-bookworm/Dockerfile
index aa8518b..d5a2c58 100644
--- a/php_8.3-apache-bullseye/Dockerfile
+++ b/php_8.3-apache-bookworm/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
@@ -70,6 +70,8 @@ RUN set -eux; \
"$APACHE_LOCK_DIR" \
"$APACHE_RUN_DIR" \
"$APACHE_LOG_DIR" \
+# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
+ "$APACHE_RUN_DIR/socks" \
; do \
rm -rvf "$dir"; \
mkdir -p "$dir"; \
@@ -255,8 +257,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.3-apache-bullseye/apache2-foreground b/php_8.3-apache-bookworm/apache2-foreground
similarity index 100%
rename from php_8.3-apache-bullseye/apache2-foreground
rename to php_8.3-apache-bookworm/apache2-foreground
diff --git a/php_8.3-apache-bullseye/docker-php-entrypoint b/php_8.3-apache-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.3-apache-bullseye/docker-php-entrypoint
rename to php_8.3-apache-bookworm/docker-php-entrypoint
diff --git a/php_8.3-apache-bullseye/docker-php-ext-configure b/php_8.3-apache-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.3-apache-bullseye/docker-php-ext-configure
rename to php_8.3-apache-bookworm/docker-php-ext-configure
diff --git a/php_8.3-apache-bullseye/docker-php-ext-enable b/php_8.3-apache-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.3-apache-bullseye/docker-php-ext-enable
rename to php_8.3-apache-bookworm/docker-php-ext-enable
diff --git a/php_8.3-apache-bullseye/docker-php-ext-install b/php_8.3-apache-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.3-apache-bullseye/docker-php-ext-install
rename to php_8.3-apache-bookworm/docker-php-ext-install
diff --git a/php_8.3-apache-bullseye/docker-php-source b/php_8.3-apache-bookworm/docker-php-source
similarity index 100%
rename from php_8.3-apache-bullseye/docker-php-source
rename to php_8.3-apache-bookworm/docker-php-source
diff --git a/php_8.3-apache/Dockerfile b/php_8.3-apache/Dockerfile
index 61dcaf6..e79e122 100644
--- a/php_8.3-apache/Dockerfile
+++ b/php_8.3-apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -54,7 +54,7 @@ ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends apache2; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# generically convert lines like
# export APACHE_RUN_USER=www-data
@@ -129,7 +129,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -257,13 +257,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.3-bullseye/Dockerfile b/php_8.3-bookworm/Dockerfile
similarity index 96%
rename from php_8.3-bullseye/Dockerfile
rename to php_8.3-bookworm/Dockerfile
index eed639e..70fea87 100644
--- a/php_8.3-bullseye/Dockerfile
+++ b/php_8.3-bookworm/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
@@ -196,8 +196,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.3-bullseye/docker-php-entrypoint b/php_8.3-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.3-bullseye/docker-php-entrypoint
rename to php_8.3-bookworm/docker-php-entrypoint
diff --git a/php_8.3-bullseye/docker-php-ext-configure b/php_8.3-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.3-bullseye/docker-php-ext-configure
rename to php_8.3-bookworm/docker-php-ext-configure
diff --git a/php_8.3-bullseye/docker-php-ext-enable b/php_8.3-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.3-bullseye/docker-php-ext-enable
rename to php_8.3-bookworm/docker-php-ext-enable
diff --git a/php_8.3-bullseye/docker-php-ext-install b/php_8.3-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.3-bullseye/docker-php-ext-install
rename to php_8.3-bookworm/docker-php-ext-install
diff --git a/php_8.3-bullseye/docker-php-source b/php_8.3-bookworm/docker-php-source
similarity index 100%
rename from php_8.3-bullseye/docker-php-source
rename to php_8.3-bookworm/docker-php-source
diff --git a/php_8.3-fpm-bullseye/Dockerfile b/php_8.3-fpm-bookworm/Dockerfile
similarity index 96%
rename from php_8.3-fpm-bullseye/Dockerfile
rename to php_8.3-fpm-bookworm/Dockerfile
index 1e0288c..0e49ee7 100644
--- a/php_8.3-fpm-bullseye/Dockerfile
+++ b/php_8.3-fpm-bookworm/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,8 +198,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.3-fpm-bullseye/docker-php-entrypoint b/php_8.3-fpm-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.3-fpm-bullseye/docker-php-entrypoint
rename to php_8.3-fpm-bookworm/docker-php-entrypoint
diff --git a/php_8.3-fpm-bullseye/docker-php-ext-configure b/php_8.3-fpm-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.3-fpm-bullseye/docker-php-ext-configure
rename to php_8.3-fpm-bookworm/docker-php-ext-configure
diff --git a/php_8.3-fpm-bullseye/docker-php-ext-enable b/php_8.3-fpm-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.3-fpm-bullseye/docker-php-ext-enable
rename to php_8.3-fpm-bookworm/docker-php-ext-enable
diff --git a/php_8.3-fpm-bullseye/docker-php-ext-install b/php_8.3-fpm-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.3-fpm-bullseye/docker-php-ext-install
rename to php_8.3-fpm-bookworm/docker-php-ext-install
diff --git a/php_8.3-fpm-bullseye/docker-php-source b/php_8.3-fpm-bookworm/docker-php-source
similarity index 100%
rename from php_8.3-fpm-bullseye/docker-php-source
rename to php_8.3-fpm-bookworm/docker-php-source
diff --git a/php_8.3-fpm/Dockerfile b/php_8.3-fpm/Dockerfile
index ac5d3b9..f0cd9c9 100644
--- a/php_8.3-fpm/Dockerfile
+++ b/php_8.3-fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -198,13 +198,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.3-zts-bullseye/Dockerfile b/php_8.3-zts-bookworm/Dockerfile
similarity index 96%
rename from php_8.3-zts-bullseye/Dockerfile
rename to php_8.3-zts-bookworm/Dockerfile
index 229b36d..b689a4e 100644
--- a/php_8.3-zts-bullseye/Dockerfile
+++ b/php_8.3-zts-bookworm/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,8 +200,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.3-zts-bullseye/docker-php-entrypoint b/php_8.3-zts-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.3-zts-bullseye/docker-php-entrypoint
rename to php_8.3-zts-bookworm/docker-php-entrypoint
diff --git a/php_8.3-zts-bullseye/docker-php-ext-configure b/php_8.3-zts-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.3-zts-bullseye/docker-php-ext-configure
rename to php_8.3-zts-bookworm/docker-php-ext-configure
diff --git a/php_8.3-zts-bullseye/docker-php-ext-enable b/php_8.3-zts-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.3-zts-bullseye/docker-php-ext-enable
rename to php_8.3-zts-bookworm/docker-php-ext-enable
diff --git a/php_8.3-zts-bullseye/docker-php-ext-install b/php_8.3-zts-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.3-zts-bullseye/docker-php-ext-install
rename to php_8.3-zts-bookworm/docker-php-ext-install
diff --git a/php_8.3-zts-bullseye/docker-php-source b/php_8.3-zts-bookworm/docker-php-source
similarity index 100%
rename from php_8.3-zts-bullseye/docker-php-source
rename to php_8.3-zts-bookworm/docker-php-source
diff --git a/php_8.3-zts/Dockerfile b/php_8.3-zts/Dockerfile
index 24a65f6..934c341 100644
--- a/php_8.3-zts/Dockerfile
+++ b/php_8.3-zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -200,13 +200,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.3/Dockerfile b/php_8.3/Dockerfile
index 89997cb..623bb09 100644
--- a/php_8.3/Dockerfile
+++ b/php_8.3/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -196,13 +196,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.5-rc-apache-bullseye/Dockerfile b/php_8.5-rc-apache-bookworm/Dockerfile
similarity index 95%
rename from php_8.5-rc-apache-bullseye/Dockerfile
rename to php_8.5-rc-apache-bookworm/Dockerfile
index d1c50e3..88bc129 100644
--- a/php_8.5-rc-apache-bullseye/Dockerfile
+++ b/php_8.5-rc-apache-bookworm/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
@@ -70,6 +70,8 @@ RUN set -eux; \
"$APACHE_LOCK_DIR" \
"$APACHE_RUN_DIR" \
"$APACHE_LOG_DIR" \
+# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
+ "$APACHE_RUN_DIR/socks" \
; do \
rm -rvf "$dir"; \
mkdir -p "$dir"; \
@@ -255,8 +257,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.5-rc-apache-bullseye/apache2-foreground b/php_8.5-rc-apache-bookworm/apache2-foreground
similarity index 100%
rename from php_8.5-rc-apache-bullseye/apache2-foreground
rename to php_8.5-rc-apache-bookworm/apache2-foreground
diff --git a/php_8.5-rc-apache-bullseye/docker-php-entrypoint b/php_8.5-rc-apache-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.5-rc-apache-bullseye/docker-php-entrypoint
rename to php_8.5-rc-apache-bookworm/docker-php-entrypoint
diff --git a/php_8.5-rc-apache-bullseye/docker-php-ext-configure b/php_8.5-rc-apache-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.5-rc-apache-bullseye/docker-php-ext-configure
rename to php_8.5-rc-apache-bookworm/docker-php-ext-configure
diff --git a/php_8.5-rc-apache-bullseye/docker-php-ext-enable b/php_8.5-rc-apache-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.5-rc-apache-bullseye/docker-php-ext-enable
rename to php_8.5-rc-apache-bookworm/docker-php-ext-enable
diff --git a/php_8.5-rc-apache-bullseye/docker-php-ext-install b/php_8.5-rc-apache-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.5-rc-apache-bullseye/docker-php-ext-install
rename to php_8.5-rc-apache-bookworm/docker-php-ext-install
diff --git a/php_8.5-rc-apache-bullseye/docker-php-source b/php_8.5-rc-apache-bookworm/docker-php-source
similarity index 100%
rename from php_8.5-rc-apache-bullseye/docker-php-source
rename to php_8.5-rc-apache-bookworm/docker-php-source
diff --git a/php_8.5-rc-apache/Dockerfile b/php_8.5-rc-apache/Dockerfile
index bb5503e..a208f9d 100644
--- a/php_8.5-rc-apache/Dockerfile
+++ b/php_8.5-rc-apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -54,7 +54,7 @@ ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends apache2; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# generically convert lines like
# export APACHE_RUN_USER=www-data
@@ -129,7 +129,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -257,13 +257,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.5-rc-bullseye/Dockerfile b/php_8.5-rc-bookworm/Dockerfile
similarity index 96%
rename from php_8.5-rc-bullseye/Dockerfile
rename to php_8.5-rc-bookworm/Dockerfile
index f008aea..a5bb3d7 100644
--- a/php_8.5-rc-bullseye/Dockerfile
+++ b/php_8.5-rc-bookworm/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
@@ -196,8 +196,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.5-rc-bullseye/docker-php-entrypoint b/php_8.5-rc-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.5-rc-bullseye/docker-php-entrypoint
rename to php_8.5-rc-bookworm/docker-php-entrypoint
diff --git a/php_8.5-rc-bullseye/docker-php-ext-configure b/php_8.5-rc-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.5-rc-bullseye/docker-php-ext-configure
rename to php_8.5-rc-bookworm/docker-php-ext-configure
diff --git a/php_8.5-rc-bullseye/docker-php-ext-enable b/php_8.5-rc-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.5-rc-bullseye/docker-php-ext-enable
rename to php_8.5-rc-bookworm/docker-php-ext-enable
diff --git a/php_8.5-rc-bullseye/docker-php-ext-install b/php_8.5-rc-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.5-rc-bullseye/docker-php-ext-install
rename to php_8.5-rc-bookworm/docker-php-ext-install
diff --git a/php_8.5-rc-bullseye/docker-php-source b/php_8.5-rc-bookworm/docker-php-source
similarity index 100%
rename from php_8.5-rc-bullseye/docker-php-source
rename to php_8.5-rc-bookworm/docker-php-source
diff --git a/php_8.5-rc-fpm-bullseye/Dockerfile b/php_8.5-rc-fpm-bookworm/Dockerfile
similarity index 96%
rename from php_8.5-rc-fpm-bullseye/Dockerfile
rename to php_8.5-rc-fpm-bookworm/Dockerfile
index d041f8c..f396894 100644
--- a/php_8.5-rc-fpm-bullseye/Dockerfile
+++ b/php_8.5-rc-fpm-bookworm/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,8 +198,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.5-rc-fpm-bullseye/docker-php-entrypoint b/php_8.5-rc-fpm-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.5-rc-fpm-bullseye/docker-php-entrypoint
rename to php_8.5-rc-fpm-bookworm/docker-php-entrypoint
diff --git a/php_8.5-rc-fpm-bullseye/docker-php-ext-configure b/php_8.5-rc-fpm-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.5-rc-fpm-bullseye/docker-php-ext-configure
rename to php_8.5-rc-fpm-bookworm/docker-php-ext-configure
diff --git a/php_8.5-rc-fpm-bullseye/docker-php-ext-enable b/php_8.5-rc-fpm-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.5-rc-fpm-bullseye/docker-php-ext-enable
rename to php_8.5-rc-fpm-bookworm/docker-php-ext-enable
diff --git a/php_8.5-rc-fpm-bullseye/docker-php-ext-install b/php_8.5-rc-fpm-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.5-rc-fpm-bullseye/docker-php-ext-install
rename to php_8.5-rc-fpm-bookworm/docker-php-ext-install
diff --git a/php_8.5-rc-fpm-bullseye/docker-php-source b/php_8.5-rc-fpm-bookworm/docker-php-source
similarity index 100%
rename from php_8.5-rc-fpm-bullseye/docker-php-source
rename to php_8.5-rc-fpm-bookworm/docker-php-source
diff --git a/php_8.5-rc-fpm/Dockerfile b/php_8.5-rc-fpm/Dockerfile
index 6731b87..aac127a 100644
--- a/php_8.5-rc-fpm/Dockerfile
+++ b/php_8.5-rc-fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -198,13 +198,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.5-rc-zts-bullseye/Dockerfile b/php_8.5-rc-zts-bookworm/Dockerfile
similarity index 96%
rename from php_8.5-rc-zts-bullseye/Dockerfile
rename to php_8.5-rc-zts-bookworm/Dockerfile
index 290324b..3f33b97 100644
--- a/php_8.5-rc-zts-bullseye/Dockerfile
+++ b/php_8.5-rc-zts-bookworm/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,8 +200,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_8.5-rc-zts-bullseye/docker-php-entrypoint b/php_8.5-rc-zts-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_8.5-rc-zts-bullseye/docker-php-entrypoint
rename to php_8.5-rc-zts-bookworm/docker-php-entrypoint
diff --git a/php_8.5-rc-zts-bullseye/docker-php-ext-configure b/php_8.5-rc-zts-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_8.5-rc-zts-bullseye/docker-php-ext-configure
rename to php_8.5-rc-zts-bookworm/docker-php-ext-configure
diff --git a/php_8.5-rc-zts-bullseye/docker-php-ext-enable b/php_8.5-rc-zts-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_8.5-rc-zts-bullseye/docker-php-ext-enable
rename to php_8.5-rc-zts-bookworm/docker-php-ext-enable
diff --git a/php_8.5-rc-zts-bullseye/docker-php-ext-install b/php_8.5-rc-zts-bookworm/docker-php-ext-install
similarity index 100%
rename from php_8.5-rc-zts-bullseye/docker-php-ext-install
rename to php_8.5-rc-zts-bookworm/docker-php-ext-install
diff --git a/php_8.5-rc-zts-bullseye/docker-php-source b/php_8.5-rc-zts-bookworm/docker-php-source
similarity index 100%
rename from php_8.5-rc-zts-bullseye/docker-php-source
rename to php_8.5-rc-zts-bookworm/docker-php-source
diff --git a/php_8.5-rc-zts/Dockerfile b/php_8.5-rc-zts/Dockerfile
index 1b7e683..95612c3 100644
--- a/php_8.5-rc-zts/Dockerfile
+++ b/php_8.5-rc-zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -200,13 +200,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_8.5-rc/Dockerfile b/php_8.5-rc/Dockerfile
index 094613a..8e6187f 100644
--- a/php_8.5-rc/Dockerfile
+++ b/php_8.5-rc/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -196,13 +196,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_apache-bullseye/Dockerfile b/php_apache-bookworm/Dockerfile
similarity index 95%
rename from php_apache-bullseye/Dockerfile
rename to php_apache-bookworm/Dockerfile
index b8a82cf..68b422c 100644
--- a/php_apache-bullseye/Dockerfile
+++ b/php_apache-bookworm/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
@@ -70,6 +70,8 @@ RUN set -eux; \
"$APACHE_LOCK_DIR" \
"$APACHE_RUN_DIR" \
"$APACHE_LOG_DIR" \
+# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
+ "$APACHE_RUN_DIR/socks" \
; do \
rm -rvf "$dir"; \
mkdir -p "$dir"; \
@@ -255,8 +257,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_apache-bullseye/apache2-foreground b/php_apache-bookworm/apache2-foreground
similarity index 100%
rename from php_apache-bullseye/apache2-foreground
rename to php_apache-bookworm/apache2-foreground
diff --git a/php_apache-bullseye/docker-php-entrypoint b/php_apache-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_apache-bullseye/docker-php-entrypoint
rename to php_apache-bookworm/docker-php-entrypoint
diff --git a/php_apache-bullseye/docker-php-ext-configure b/php_apache-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_apache-bullseye/docker-php-ext-configure
rename to php_apache-bookworm/docker-php-ext-configure
diff --git a/php_apache-bullseye/docker-php-ext-enable b/php_apache-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_apache-bullseye/docker-php-ext-enable
rename to php_apache-bookworm/docker-php-ext-enable
diff --git a/php_apache-bullseye/docker-php-ext-install b/php_apache-bookworm/docker-php-ext-install
similarity index 100%
rename from php_apache-bullseye/docker-php-ext-install
rename to php_apache-bookworm/docker-php-ext-install
diff --git a/php_apache-bullseye/docker-php-source b/php_apache-bookworm/docker-php-source
similarity index 100%
rename from php_apache-bullseye/docker-php-source
rename to php_apache-bookworm/docker-php-source
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index 7c51bcc..d5d83a2 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -54,7 +54,7 @@ ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends apache2; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# generically convert lines like
# export APACHE_RUN_USER=www-data
@@ -129,7 +129,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -257,13 +257,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_bullseye/Dockerfile b/php_bookworm/Dockerfile
similarity index 96%
rename from php_bullseye/Dockerfile
rename to php_bookworm/Dockerfile
index 3ba0bc4..e129149 100644
--- a/php_bullseye/Dockerfile
+++ b/php_bookworm/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
@@ -196,8 +196,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_bullseye/docker-php-entrypoint b/php_bookworm/docker-php-entrypoint
similarity index 100%
rename from php_bullseye/docker-php-entrypoint
rename to php_bookworm/docker-php-entrypoint
diff --git a/php_bullseye/docker-php-ext-configure b/php_bookworm/docker-php-ext-configure
similarity index 100%
rename from php_bullseye/docker-php-ext-configure
rename to php_bookworm/docker-php-ext-configure
diff --git a/php_bullseye/docker-php-ext-enable b/php_bookworm/docker-php-ext-enable
similarity index 100%
rename from php_bullseye/docker-php-ext-enable
rename to php_bookworm/docker-php-ext-enable
diff --git a/php_bullseye/docker-php-ext-install b/php_bookworm/docker-php-ext-install
similarity index 100%
rename from php_bullseye/docker-php-ext-install
rename to php_bookworm/docker-php-ext-install
diff --git a/php_bullseye/docker-php-source b/php_bookworm/docker-php-source
similarity index 100%
rename from php_bullseye/docker-php-source
rename to php_bookworm/docker-php-source
diff --git a/php_fpm-bullseye/Dockerfile b/php_fpm-bookworm/Dockerfile
similarity index 96%
rename from php_fpm-bullseye/Dockerfile
rename to php_fpm-bookworm/Dockerfile
index 896ac73..44f4efd 100644
--- a/php_fpm-bullseye/Dockerfile
+++ b/php_fpm-bookworm/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,8 +198,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_fpm-bullseye/docker-php-entrypoint b/php_fpm-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_fpm-bullseye/docker-php-entrypoint
rename to php_fpm-bookworm/docker-php-entrypoint
diff --git a/php_fpm-bullseye/docker-php-ext-configure b/php_fpm-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_fpm-bullseye/docker-php-ext-configure
rename to php_fpm-bookworm/docker-php-ext-configure
diff --git a/php_fpm-bullseye/docker-php-ext-enable b/php_fpm-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_fpm-bullseye/docker-php-ext-enable
rename to php_fpm-bookworm/docker-php-ext-enable
diff --git a/php_fpm-bullseye/docker-php-ext-install b/php_fpm-bookworm/docker-php-ext-install
similarity index 100%
rename from php_fpm-bullseye/docker-php-ext-install
rename to php_fpm-bookworm/docker-php-ext-install
diff --git a/php_fpm-bullseye/docker-php-source b/php_fpm-bookworm/docker-php-source
similarity index 100%
rename from php_fpm-bullseye/docker-php-source
rename to php_fpm-bookworm/docker-php-source
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index eae45ed..d5d0fe8 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -198,13 +198,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index e636bbe..a395287 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -196,13 +196,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \
diff --git a/php_zts-bullseye/Dockerfile b/php_zts-bookworm/Dockerfile
similarity index 96%
rename from php_zts-bullseye/Dockerfile
rename to php_zts-bookworm/Dockerfile
index b87b87d..ca6b905 100644
--- a/php_zts-bullseye/Dockerfile
+++ b/php_zts-bookworm/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,8 +200,9 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
diff --git a/php_zts-bullseye/docker-php-entrypoint b/php_zts-bookworm/docker-php-entrypoint
similarity index 100%
rename from php_zts-bullseye/docker-php-entrypoint
rename to php_zts-bookworm/docker-php-entrypoint
diff --git a/php_zts-bullseye/docker-php-ext-configure b/php_zts-bookworm/docker-php-ext-configure
similarity index 100%
rename from php_zts-bullseye/docker-php-ext-configure
rename to php_zts-bookworm/docker-php-ext-configure
diff --git a/php_zts-bullseye/docker-php-ext-enable b/php_zts-bookworm/docker-php-ext-enable
similarity index 100%
rename from php_zts-bullseye/docker-php-ext-enable
rename to php_zts-bookworm/docker-php-ext-enable
diff --git a/php_zts-bullseye/docker-php-ext-install b/php_zts-bookworm/docker-php-ext-install
similarity index 100%
rename from php_zts-bullseye/docker-php-ext-install
rename to php_zts-bookworm/docker-php-ext-install
diff --git a/php_zts-bullseye/docker-php-source b/php_zts-bookworm/docker-php-source
similarity index 100%
rename from php_zts-bullseye/docker-php-source
rename to php_zts-bookworm/docker-php-source
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index ee22919..33417fa 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
# prevent Debian's PHP packages from being installed
# https://github.com/docker-library/php/pull/542
@@ -37,7 +37,7 @@ RUN set -eux; \
curl \
xz-utils \
; \
- rm -rf /var/lib/apt/lists/*
+ apt-get dist-clean
ENV PHP_INI_DIR /usr/local/etc/php
RUN set -eux; \
@@ -69,7 +69,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends gnupg; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
mkdir -p /usr/src; \
cd /usr/src; \
@@ -200,13 +200,14 @@ RUN set -eux; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
| sort -u \
- | xargs -r dpkg-query --search \
- | cut -d: -f1 \
+ | xargs -rt dpkg-query --search \
+# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+ | awk 'sub(":$", "", $1) { print $1 }' \
| sort -u \
| xargs -r apt-mark manual \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*; \
+ apt-get dist-clean; \
\
# update pecl channel definitions https://github.com/docker-library/php/issues/443
pecl update-channels; \Relevant Maintainers: |
tianon
approved these changes
Aug 12, 2025
Member
tianon
left a comment
tianon
left a comment
There was a problem hiding this comment.
Hold till after the
debian:trixierelease image build.
Member
|
FYI affected maintainers for the
Please either drop the affected tags from the supported list (by removing them from your (Also, if you're not supposed to be in this list, or you're getting this forwarded to you and you are supposed to be in this list, please update the |
This was referenced Aug 19, 2025
Merged
Muscraft
pushed a commit
to Muscraft/official-images
that referenced
this pull request
Aug 19, 2025
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: