Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Dec 2, 2025

@tianon tianon requested a review from a team as a code owner December 2, 2025 00:07
@github-actions

This comment has been minimized.

Changes:

- docker-library/wordpress@b962e97: Use PHP_INI_DIR provided by the php base images (docker-library/wordpress#991)
- docker-library/wordpress@ee43abe: Update beta
- docker-library/wordpress@3ca512a: Add PHP 8.5 support (docker-library/wordpress#986)
- docker-library/wordpress@63ce84b: Update beta to 6.9-RC4
@github-actions
Copy link

github-actions bot commented Dec 2, 2025

Diff for cd53c8d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 17d6e9d..4e32b7e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,140 +3,175 @@ GitRepo: https://github.com/docker-library/wordpress.git
 
 Tags: 6.8.3-apache, 6.8-apache, 6-apache, apache, 6.8.3, 6.8, 6, latest, 6.8.3-php8.3-apache, 6.8-php8.3-apache, 6-php8.3-apache, php8.3-apache, 6.8.3-php8.3, 6.8-php8.3, 6-php8.3, php8.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.3/apache
 
 Tags: 6.8.3-fpm, 6.8-fpm, 6-fpm, fpm, 6.8.3-php8.3-fpm, 6.8-php8.3-fpm, 6-php8.3-fpm, php8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.3/fpm
 
 Tags: 6.8.3-fpm-alpine, 6.8-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.8.3-php8.3-fpm-alpine, 6.8-php8.3-fpm-alpine, 6-php8.3-fpm-alpine, php8.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.3/fpm-alpine
 
 Tags: 6.8.3-php8.1-apache, 6.8-php8.1-apache, 6-php8.1-apache, php8.1-apache, 6.8.3-php8.1, 6.8-php8.1, 6-php8.1, php8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.1/apache
 
 Tags: 6.8.3-php8.1-fpm, 6.8-php8.1-fpm, 6-php8.1-fpm, php8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.1/fpm
 
 Tags: 6.8.3-php8.1-fpm-alpine, 6.8-php8.1-fpm-alpine, 6-php8.1-fpm-alpine, php8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.1/fpm-alpine
 
 Tags: 6.8.3-php8.2-apache, 6.8-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.8.3-php8.2, 6.8-php8.2, 6-php8.2, php8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.2/apache
 
 Tags: 6.8.3-php8.2-fpm, 6.8-php8.2-fpm, 6-php8.2-fpm, php8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.2/fpm
 
 Tags: 6.8.3-php8.2-fpm-alpine, 6.8-php8.2-fpm-alpine, 6-php8.2-fpm-alpine, php8.2-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.2/fpm-alpine
 
 Tags: 6.8.3-php8.4-apache, 6.8-php8.4-apache, 6-php8.4-apache, php8.4-apache, 6.8.3-php8.4, 6.8-php8.4, 6-php8.4, php8.4
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.4/apache
 
 Tags: 6.8.3-php8.4-fpm, 6.8-php8.4-fpm, 6-php8.4-fpm, php8.4-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.4/fpm
 
 Tags: 6.8.3-php8.4-fpm-alpine, 6.8-php8.4-fpm-alpine, 6-php8.4-fpm-alpine, php8.4-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f143dd4b24dcefc3b633e4a10ed3534d92b91c23
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: latest/php8.4/fpm-alpine
 
-Tags: beta-6.9-RC3-apache, beta-6.9-apache, beta-6-apache, beta-apache, beta-6.9-RC3, beta-6.9, beta-6, beta, beta-6.9-RC3-php8.3-apache, beta-6.9-php8.3-apache, beta-6-php8.3-apache, beta-php8.3-apache, beta-6.9-RC3-php8.3, beta-6.9-php8.3, beta-6-php8.3, beta-php8.3
+Tags: 6.8.3-php8.5-apache, 6.8-php8.5-apache, 6-php8.5-apache, php8.5-apache, 6.8.3-php8.5, 6.8-php8.5, 6-php8.5, php8.5
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: latest/php8.5/apache
+
+Tags: 6.8.3-php8.5-fpm, 6.8-php8.5-fpm, 6-php8.5-fpm, php8.5-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: latest/php8.5/fpm
+
+Tags: 6.8.3-php8.5-fpm-alpine, 6.8-php8.5-fpm-alpine, 6-php8.5-fpm-alpine, php8.5-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: latest/php8.5/fpm-alpine
+
+Tags: beta-6.9-RC4-apache, beta-6.9-apache, beta-6-apache, beta-apache, beta-6.9-RC4, beta-6.9, beta-6, beta, beta-6.9-RC4-php8.3-apache, beta-6.9-php8.3-apache, beta-6-php8.3-apache, beta-php8.3-apache, beta-6.9-RC4-php8.3, beta-6.9-php8.3, beta-6-php8.3, beta-php8.3
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.3/apache
 
-Tags: beta-6.9-RC3-fpm, beta-6.9-fpm, beta-6-fpm, beta-fpm, beta-6.9-RC3-php8.3-fpm, beta-6.9-php8.3-fpm, beta-6-php8.3-fpm, beta-php8.3-fpm
+Tags: beta-6.9-RC4-fpm, beta-6.9-fpm, beta-6-fpm, beta-fpm, beta-6.9-RC4-php8.3-fpm, beta-6.9-php8.3-fpm, beta-6-php8.3-fpm, beta-php8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.3/fpm
 
-Tags: beta-6.9-RC3-fpm-alpine, beta-6.9-fpm-alpine, beta-6-fpm-alpine, beta-fpm-alpine, beta-6.9-RC3-php8.3-fpm-alpine, beta-6.9-php8.3-fpm-alpine, beta-6-php8.3-fpm-alpine, beta-php8.3-fpm-alpine
+Tags: beta-6.9-RC4-fpm-alpine, beta-6.9-fpm-alpine, beta-6-fpm-alpine, beta-fpm-alpine, beta-6.9-RC4-php8.3-fpm-alpine, beta-6.9-php8.3-fpm-alpine, beta-6-php8.3-fpm-alpine, beta-php8.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.3/fpm-alpine
 
-Tags: beta-6.9-RC3-php8.1-apache, beta-6.9-php8.1-apache, beta-6-php8.1-apache, beta-php8.1-apache, beta-6.9-RC3-php8.1, beta-6.9-php8.1, beta-6-php8.1, beta-php8.1
+Tags: beta-6.9-RC4-php8.1-apache, beta-6.9-php8.1-apache, beta-6-php8.1-apache, beta-php8.1-apache, beta-6.9-RC4-php8.1, beta-6.9-php8.1, beta-6-php8.1, beta-php8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.1/apache
 
-Tags: beta-6.9-RC3-php8.1-fpm, beta-6.9-php8.1-fpm, beta-6-php8.1-fpm, beta-php8.1-fpm
+Tags: beta-6.9-RC4-php8.1-fpm, beta-6.9-php8.1-fpm, beta-6-php8.1-fpm, beta-php8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.1/fpm
 
-Tags: beta-6.9-RC3-php8.1-fpm-alpine, beta-6.9-php8.1-fpm-alpine, beta-6-php8.1-fpm-alpine, beta-php8.1-fpm-alpine
+Tags: beta-6.9-RC4-php8.1-fpm-alpine, beta-6.9-php8.1-fpm-alpine, beta-6-php8.1-fpm-alpine, beta-php8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.1/fpm-alpine
 
-Tags: beta-6.9-RC3-php8.2-apache, beta-6.9-php8.2-apache, beta-6-php8.2-apache, beta-php8.2-apache, beta-6.9-RC3-php8.2, beta-6.9-php8.2, beta-6-php8.2, beta-php8.2
+Tags: beta-6.9-RC4-php8.2-apache, beta-6.9-php8.2-apache, beta-6-php8.2-apache, beta-php8.2-apache, beta-6.9-RC4-php8.2, beta-6.9-php8.2, beta-6-php8.2, beta-php8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.2/apache
 
-Tags: beta-6.9-RC3-php8.2-fpm, beta-6.9-php8.2-fpm, beta-6-php8.2-fpm, beta-php8.2-fpm
+Tags: beta-6.9-RC4-php8.2-fpm, beta-6.9-php8.2-fpm, beta-6-php8.2-fpm, beta-php8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.2/fpm
 
-Tags: beta-6.9-RC3-php8.2-fpm-alpine, beta-6.9-php8.2-fpm-alpine, beta-6-php8.2-fpm-alpine, beta-php8.2-fpm-alpine
+Tags: beta-6.9-RC4-php8.2-fpm-alpine, beta-6.9-php8.2-fpm-alpine, beta-6-php8.2-fpm-alpine, beta-php8.2-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.2/fpm-alpine
 
-Tags: beta-6.9-RC3-php8.4-apache, beta-6.9-php8.4-apache, beta-6-php8.4-apache, beta-php8.4-apache, beta-6.9-RC3-php8.4, beta-6.9-php8.4, beta-6-php8.4, beta-php8.4
+Tags: beta-6.9-RC4-php8.4-apache, beta-6.9-php8.4-apache, beta-6-php8.4-apache, beta-php8.4-apache, beta-6.9-RC4-php8.4, beta-6.9-php8.4, beta-6-php8.4, beta-php8.4
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.4/apache
 
-Tags: beta-6.9-RC3-php8.4-fpm, beta-6.9-php8.4-fpm, beta-6-php8.4-fpm, beta-php8.4-fpm
+Tags: beta-6.9-RC4-php8.4-fpm, beta-6.9-php8.4-fpm, beta-6-php8.4-fpm, beta-php8.4-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.4/fpm
 
-Tags: beta-6.9-RC3-php8.4-fpm-alpine, beta-6.9-php8.4-fpm-alpine, beta-6-php8.4-fpm-alpine, beta-php8.4-fpm-alpine
+Tags: beta-6.9-RC4-php8.4-fpm-alpine, beta-6.9-php8.4-fpm-alpine, beta-6-php8.4-fpm-alpine, beta-php8.4-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 86e645ec776571fee63faaa482e90fb3f6442587
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: beta/php8.4/fpm-alpine
 
+Tags: beta-6.9-RC4-php8.5-apache, beta-6.9-php8.5-apache, beta-6-php8.5-apache, beta-php8.5-apache, beta-6.9-RC4-php8.5, beta-6.9-php8.5, beta-6-php8.5, beta-php8.5
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: beta/php8.5/apache
+
+Tags: beta-6.9-RC4-php8.5-fpm, beta-6.9-php8.5-fpm, beta-6-php8.5-fpm, beta-php8.5-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: beta/php8.5/fpm
+
+Tags: beta-6.9-RC4-php8.5-fpm-alpine, beta-6.9-php8.5-fpm-alpine, beta-6-php8.5-fpm-alpine, beta-php8.5-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: beta/php8.5/fpm-alpine
+
 Tags: cli-2.12.0, cli-2.12, cli-2, cli, cli-2.12.0-php8.3, cli-2.12-php8.3, cli-2-php8.3, cli-php8.3
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 50da133eabc137fa07c620c77788c1237cf55c8b
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: cli/php8.3/alpine
 
 Tags: cli-2.12.0-php8.1, cli-2.12-php8.1, cli-2-php8.1, cli-php8.1
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 50da133eabc137fa07c620c77788c1237cf55c8b
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: cli/php8.1/alpine
 
 Tags: cli-2.12.0-php8.2, cli-2.12-php8.2, cli-2-php8.2, cli-php8.2
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 50da133eabc137fa07c620c77788c1237cf55c8b
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: cli/php8.2/alpine
 
 Tags: cli-2.12.0-php8.4, cli-2.12-php8.4, cli-2-php8.4, cli-php8.4
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 50da133eabc137fa07c620c77788c1237cf55c8b
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
 Directory: cli/php8.4/alpine
+
+Tags: cli-2.12.0-php8.5, cli-2.12-php8.5, cli-2-php8.5, cli-php8.5
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b962e97ba0d6cfd8784a521fb9d05fc89aa180a9
+Directory: cli/php8.5/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index d444bc3..f47b034 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,6 +18,10 @@ wordpress:6-php8.4
 wordpress:6-php8.4-apache
 wordpress:6-php8.4-fpm
 wordpress:6-php8.4-fpm-alpine
+wordpress:6-php8.5
+wordpress:6-php8.5-apache
+wordpress:6-php8.5-fpm
+wordpress:6-php8.5-fpm-alpine
 wordpress:6.8
 wordpress:6.8-apache
 wordpress:6.8-fpm
@@ -38,6 +42,10 @@ wordpress:6.8-php8.4
 wordpress:6.8-php8.4-apache
 wordpress:6.8-php8.4-fpm
 wordpress:6.8-php8.4-fpm-alpine
+wordpress:6.8-php8.5
+wordpress:6.8-php8.5-apache
+wordpress:6.8-php8.5-fpm
+wordpress:6.8-php8.5-fpm-alpine
 wordpress:6.8.3
 wordpress:6.8.3-apache
 wordpress:6.8.3-fpm
@@ -58,6 +66,10 @@ wordpress:6.8.3-php8.4
 wordpress:6.8.3-php8.4-apache
 wordpress:6.8.3-php8.4-fpm
 wordpress:6.8.3-php8.4-fpm-alpine
+wordpress:6.8.3-php8.5
+wordpress:6.8.3-php8.5-apache
+wordpress:6.8.3-php8.5-fpm
+wordpress:6.8.3-php8.5-fpm-alpine
 wordpress:apache
 wordpress:beta
 wordpress:beta-6
@@ -80,27 +92,35 @@ wordpress:beta-6-php8.4
 wordpress:beta-6-php8.4-apache
 wordpress:beta-6-php8.4-fpm
 wordpress:beta-6-php8.4-fpm-alpine
+wordpress:beta-6-php8.5
+wordpress:beta-6-php8.5-apache
+wordpress:beta-6-php8.5-fpm
+wordpress:beta-6-php8.5-fpm-alpine
 wordpress:beta-6.9
-wordpress:beta-6.9-RC3
-wordpress:beta-6.9-RC3-apache
-wordpress:beta-6.9-RC3-fpm
-wordpress:beta-6.9-RC3-fpm-alpine
-wordpress:beta-6.9-RC3-php8.1
-wordpress:beta-6.9-RC3-php8.1-apache
-wordpress:beta-6.9-RC3-php8.1-fpm
-wordpress:beta-6.9-RC3-php8.1-fpm-alpine
-wordpress:beta-6.9-RC3-php8.2
-wordpress:beta-6.9-RC3-php8.2-apache
-wordpress:beta-6.9-RC3-php8.2-fpm
-wordpress:beta-6.9-RC3-php8.2-fpm-alpine
-wordpress:beta-6.9-RC3-php8.3
-wordpress:beta-6.9-RC3-php8.3-apache
-wordpress:beta-6.9-RC3-php8.3-fpm
-wordpress:beta-6.9-RC3-php8.3-fpm-alpine
-wordpress:beta-6.9-RC3-php8.4
-wordpress:beta-6.9-RC3-php8.4-apache
-wordpress:beta-6.9-RC3-php8.4-fpm
-wordpress:beta-6.9-RC3-php8.4-fpm-alpine
+wordpress:beta-6.9-RC4
+wordpress:beta-6.9-RC4-apache
+wordpress:beta-6.9-RC4-fpm
+wordpress:beta-6.9-RC4-fpm-alpine
+wordpress:beta-6.9-RC4-php8.1
+wordpress:beta-6.9-RC4-php8.1-apache
+wordpress:beta-6.9-RC4-php8.1-fpm
+wordpress:beta-6.9-RC4-php8.1-fpm-alpine
+wordpress:beta-6.9-RC4-php8.2
+wordpress:beta-6.9-RC4-php8.2-apache
+wordpress:beta-6.9-RC4-php8.2-fpm
+wordpress:beta-6.9-RC4-php8.2-fpm-alpine
+wordpress:beta-6.9-RC4-php8.3
+wordpress:beta-6.9-RC4-php8.3-apache
+wordpress:beta-6.9-RC4-php8.3-fpm
+wordpress:beta-6.9-RC4-php8.3-fpm-alpine
+wordpress:beta-6.9-RC4-php8.4
+wordpress:beta-6.9-RC4-php8.4-apache
+wordpress:beta-6.9-RC4-php8.4-fpm
+wordpress:beta-6.9-RC4-php8.4-fpm-alpine
+wordpress:beta-6.9-RC4-php8.5
+wordpress:beta-6.9-RC4-php8.5-apache
+wordpress:beta-6.9-RC4-php8.5-fpm
+wordpress:beta-6.9-RC4-php8.5-fpm-alpine
 wordpress:beta-6.9-apache
 wordpress:beta-6.9-fpm
 wordpress:beta-6.9-fpm-alpine
@@ -120,6 +140,10 @@ wordpress:beta-6.9-php8.4
 wordpress:beta-6.9-php8.4-apache
 wordpress:beta-6.9-php8.4-fpm
 wordpress:beta-6.9-php8.4-fpm-alpine
+wordpress:beta-6.9-php8.5
+wordpress:beta-6.9-php8.5-apache
+wordpress:beta-6.9-php8.5-fpm
+wordpress:beta-6.9-php8.5-fpm-alpine
 wordpress:beta-apache
 wordpress:beta-fpm
 wordpress:beta-fpm-alpine
@@ -139,26 +163,34 @@ wordpress:beta-php8.4
 wordpress:beta-php8.4-apache
 wordpress:beta-php8.4-fpm
 wordpress:beta-php8.4-fpm-alpine
+wordpress:beta-php8.5
+wordpress:beta-php8.5-apache
+wordpress:beta-php8.5-fpm
+wordpress:beta-php8.5-fpm-alpine
 wordpress:cli
 wordpress:cli-2
 wordpress:cli-2-php8.1
 wordpress:cli-2-php8.2
 wordpress:cli-2-php8.3
 wordpress:cli-2-php8.4
+wordpress:cli-2-php8.5
 wordpress:cli-2.12
 wordpress:cli-2.12-php8.1
 wordpress:cli-2.12-php8.2
 wordpress:cli-2.12-php8.3
 wordpress:cli-2.12-php8.4
+wordpress:cli-2.12-php8.5
 wordpress:cli-2.12.0
 wordpress:cli-2.12.0-php8.1
 wordpress:cli-2.12.0-php8.2
 wordpress:cli-2.12.0-php8.3
 wordpress:cli-2.12.0-php8.4
+wordpress:cli-2.12.0-php8.5
 wordpress:cli-php8.1
 wordpress:cli-php8.2
 wordpress:cli-php8.3
 wordpress:cli-php8.4
+wordpress:cli-php8.5
 wordpress:fpm
 wordpress:fpm-alpine
 wordpress:latest
@@ -178,3 +210,7 @@ wordpress:php8.4
 wordpress:php8.4-apache
 wordpress:php8.4-fpm
 wordpress:php8.4-fpm-alpine
+wordpress:php8.5
+wordpress:php8.5-apache
+wordpress:php8.5-fpm
+wordpress:php8.5-fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 33d8bd9..1fbb18d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -10,10 +10,14 @@ wordpress:beta-php8.3-fpm-alpine
 wordpress:beta-php8.4
 wordpress:beta-php8.4-fpm
 wordpress:beta-php8.4-fpm-alpine
+wordpress:beta-php8.5
+wordpress:beta-php8.5-fpm
+wordpress:beta-php8.5-fpm-alpine
 wordpress:cli-php8.1
 wordpress:cli-php8.2
 wordpress:cli-php8.3
 wordpress:cli-php8.4
+wordpress:cli-php8.5
 wordpress:php8.1
 wordpress:php8.1-fpm
 wordpress:php8.1-fpm-alpine
@@ -26,3 +30,6 @@ wordpress:php8.3-fpm-alpine
 wordpress:php8.4
 wordpress:php8.4-fpm
 wordpress:php8.4-fpm-alpine
+wordpress:php8.5
+wordpress:php8.5-fpm
+wordpress:php8.5-fpm-alpine
diff --git a/wordpress_beta-php8.1-fpm-alpine/Dockerfile b/wordpress_beta-php8.1-fpm-alpine/Dockerfile
index f581169..a77e6d9 100644
--- a/wordpress_beta-php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.1-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,11 +98,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1-fpm/Dockerfile b/wordpress_beta-php8.1-fpm/Dockerfile
index 27d9b31..6704324 100644
--- a/wordpress_beta-php8.1-fpm/Dockerfile
+++ b/wordpress_beta-php8.1-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,11 +102,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1/Dockerfile b/wordpress_beta-php8.1/Dockerfile
index e8d44f8..f81ca23 100644
--- a/wordpress_beta-php8.1/Dockerfile
+++ b/wordpress_beta-php8.1/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
@@ -123,8 +124,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.2-fpm-alpine/Dockerfile b/wordpress_beta-php8.2-fpm-alpine/Dockerfile
index b7e4054..b492482 100644
--- a/wordpress_beta-php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.2-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,11 +98,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.2-fpm/Dockerfile b/wordpress_beta-php8.2-fpm/Dockerfile
index ea8ff90..a0a3666 100644
--- a/wordpress_beta-php8.2-fpm/Dockerfile
+++ b/wordpress_beta-php8.2-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,11 +102,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.2/Dockerfile b/wordpress_beta-php8.2/Dockerfile
index 38cb173..8985e3e 100644
--- a/wordpress_beta-php8.2/Dockerfile
+++ b/wordpress_beta-php8.2/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
@@ -123,8 +124,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.3-fpm-alpine/Dockerfile b/wordpress_beta-php8.3-fpm-alpine/Dockerfile
index 1baad5e..d939abb 100644
--- a/wordpress_beta-php8.3-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.3-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,11 +98,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.3-fpm/Dockerfile b/wordpress_beta-php8.3-fpm/Dockerfile
index ab3c508..c980226 100644
--- a/wordpress_beta-php8.3-fpm/Dockerfile
+++ b/wordpress_beta-php8.3-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,11 +102,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.3/Dockerfile b/wordpress_beta-php8.3/Dockerfile
index 329ef88..9523ae3 100644
--- a/wordpress_beta-php8.3/Dockerfile
+++ b/wordpress_beta-php8.3/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
@@ -123,8 +124,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.4-fpm-alpine/Dockerfile b/wordpress_beta-php8.4-fpm-alpine/Dockerfile
index 6eb5c91..765770d 100644
--- a/wordpress_beta-php8.4-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.4-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,11 +98,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.4-fpm/Dockerfile b/wordpress_beta-php8.4-fpm/Dockerfile
index cc67735..da897a1 100644
--- a/wordpress_beta-php8.4-fpm/Dockerfile
+++ b/wordpress_beta-php8.4-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,11 +102,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.4/Dockerfile b/wordpress_beta-php8.4/Dockerfile
index 9e16e66..ca9421b 100644
--- a/wordpress_beta-php8.4/Dockerfile
+++ b/wordpress_beta-php8.4/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
@@ -123,8 +124,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/Dockerfile b/wordpress_beta-php8.5-fpm-alpine/Dockerfile
similarity index 93%
copy from wordpress_beta-php8.1-fpm-alpine/Dockerfile
copy to wordpress_beta-php8.5-fpm-alpine/Dockerfile
index f581169..ae8bbcc 100644
--- a/wordpress_beta-php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.5-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.1-fpm-alpine
+FROM php:8.5-fpm-alpine
 
 # persistent dependencies
 RUN set -eux; \
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,11 +98,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.5-fpm-alpine/docker-entrypoint.sh
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.5-fpm-alpine/docker-entrypoint.sh
diff --git a/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.5-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.5-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_beta-php8.2-fpm/Dockerfile b/wordpress_beta-php8.5-fpm/Dockerfile
similarity index 93%
copy from wordpress_beta-php8.2-fpm/Dockerfile
copy to wordpress_beta-php8.5-fpm/Dockerfile
index ea8ff90..e3be70a 100644
--- a/wordpress_beta-php8.2-fpm/Dockerfile
+++ b/wordpress_beta-php8.5-fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.2-fpm
+FROM php:8.5-fpm
 
 # persistent dependencies
 RUN set -eux; \
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,11 +102,11 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.5-fpm/docker-entrypoint.sh
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.5-fpm/docker-entrypoint.sh
diff --git a/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.5-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.5-fpm/wp-config-docker.php
diff --git a/wordpress_beta-php8.3/Dockerfile b/wordpress_beta-php8.5/Dockerfile
similarity index 94%
copy from wordpress_beta-php8.3/Dockerfile
copy to wordpress_beta-php8.5/Dockerfile
index 329ef88..6b52202 100644
--- a/wordpress_beta-php8.3/Dockerfile
+++ b/wordpress_beta-php8.5/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.3-apache
+FROM php:8.5-apache
 
 # persistent dependencies
 RUN set -eux; \
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
@@ -123,8 +124,8 @@ RUN set -eux; \
 	find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
 RUN set -eux; \
-	version='6.9-RC3'; \
-	sha1='f98c7ce5304d9a3543101678e43a2622f76abcd9'; \
+	version='6.9-RC4'; \
+	sha1='6ea7ab11aa35b69d85c316700efafc45ea10e5da'; \
 	\
 	curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
 	echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.5/docker-entrypoint.sh
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.5/docker-entrypoint.sh
diff --git a/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.5/wp-config-docker.php
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.5/wp-config-docker.php
diff --git a/wordpress_cli-php8.1/Dockerfile b/wordpress_cli-php8.1/Dockerfile
index 3c9cce7..ada00e9 100644
--- a/wordpress_cli-php8.1/Dockerfile
+++ b/wordpress_cli-php8.1/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -78,7 +78,8 @@ RUN set -ex; \
 # set recommended PHP.ini settings
 # excluding opcache due https://github.com/docker-library/wordpress/issues/407
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -90,7 +91,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 # https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
 # pub   rsa2048 2018-05-31 [SC]
diff --git a/wordpress_cli-php8.2/Dockerfile b/wordpress_cli-php8.2/Dockerfile
index c52674d..cda8c98 100644
--- a/wordpress_cli-php8.2/Dockerfile
+++ b/wordpress_cli-php8.2/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -78,7 +78,8 @@ RUN set -ex; \
 # set recommended PHP.ini settings
 # excluding opcache due https://github.com/docker-library/wordpress/issues/407
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -90,7 +91,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 # https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
 # pub   rsa2048 2018-05-31 [SC]
diff --git a/wordpress_cli-php8.3/Dockerfile b/wordpress_cli-php8.3/Dockerfile
index 8fd438c..31fa8df 100644
--- a/wordpress_cli-php8.3/Dockerfile
+++ b/wordpress_cli-php8.3/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -78,7 +78,8 @@ RUN set -ex; \
 # set recommended PHP.ini settings
 # excluding opcache due https://github.com/docker-library/wordpress/issues/407
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -90,7 +91,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 # https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
 # pub   rsa2048 2018-05-31 [SC]
diff --git a/wordpress_cli-php8.4/Dockerfile b/wordpress_cli-php8.4/Dockerfile
index 8e66e65..c7948b4 100644
--- a/wordpress_cli-php8.4/Dockerfile
+++ b/wordpress_cli-php8.4/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -78,7 +78,8 @@ RUN set -ex; \
 # set recommended PHP.ini settings
 # excluding opcache due https://github.com/docker-library/wordpress/issues/407
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -90,7 +91,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 # https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
 # pub   rsa2048 2018-05-31 [SC]
diff --git a/wordpress_cli-php8.1/Dockerfile b/wordpress_cli-php8.5/Dockerfile
similarity index 97%
copy from wordpress_cli-php8.1/Dockerfile
copy to wordpress_cli-php8.5/Dockerfile
index 3c9cce7..147f4bd 100644
--- a/wordpress_cli-php8.1/Dockerfile
+++ b/wordpress_cli-php8.5/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.1-alpine
+FROM php:8.5-alpine
 
 # install wp-cli dependencies
 RUN apk add --no-cache \
@@ -49,7 +49,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -78,7 +78,8 @@ RUN set -ex; \
 # set recommended PHP.ini settings
 # excluding opcache due https://github.com/docker-library/wordpress/issues/407
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -90,7 +91,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 # https://make.wordpress.org/cli/2018/05/31/gpg-signature-change/
 # pub   rsa2048 2018-05-31 [SC]
diff --git a/wordpress_cli-php8.1/docker-entrypoint.sh b/wordpress_cli-php8.5/docker-entrypoint.sh
similarity index 100%
copy from wordpress_cli-php8.1/docker-entrypoint.sh
copy to wordpress_cli-php8.5/docker-entrypoint.sh
diff --git a/wordpress_php8.1-fpm-alpine/Dockerfile b/wordpress_php8.1-fpm-alpine/Dockerfile
index 868d4f4..bbbcf2c 100644
--- a/wordpress_php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_php8.1-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,7 +98,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.1-fpm/Dockerfile b/wordpress_php8.1-fpm/Dockerfile
index ad7b1d6..0a236a7 100644
--- a/wordpress_php8.1-fpm/Dockerfile
+++ b/wordpress_php8.1-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.1/Dockerfile b/wordpress_php8.1/Dockerfile
index 696e787..c20f8c4 100644
--- a/wordpress_php8.1/Dockerfile
+++ b/wordpress_php8.1/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
diff --git a/wordpress_php8.2-fpm-alpine/Dockerfile b/wordpress_php8.2-fpm-alpine/Dockerfile
index 0f821b9..0b0b3ad 100644
--- a/wordpress_php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_php8.2-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,7 +98,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.2-fpm/Dockerfile b/wordpress_php8.2-fpm/Dockerfile
index 9fe5bbd..3d27baa 100644
--- a/wordpress_php8.2-fpm/Dockerfile
+++ b/wordpress_php8.2-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.2/Dockerfile b/wordpress_php8.2/Dockerfile
index 15cda0b..2d4c453 100644
--- a/wordpress_php8.2/Dockerfile
+++ b/wordpress_php8.2/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
diff --git a/wordpress_php8.3-fpm-alpine/Dockerfile b/wordpress_php8.3-fpm-alpine/Dockerfile
index 15239cf..c319154 100644
--- a/wordpress_php8.3-fpm-alpine/Dockerfile
+++ b/wordpress_php8.3-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,7 +98,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.3-fpm/Dockerfile b/wordpress_php8.3-fpm/Dockerfile
index 990d151..b93b603 100644
--- a/wordpress_php8.3-fpm/Dockerfile
+++ b/wordpress_php8.3-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.3/Dockerfile b/wordpress_php8.3/Dockerfile
index 43fd2d4..79412b2 100644
--- a/wordpress_php8.3/Dockerfile
+++ b/wordpress_php8.3/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
diff --git a/wordpress_php8.4-fpm-alpine/Dockerfile b/wordpress_php8.4-fpm-alpine/Dockerfile
index 33a920f..428bf01 100644
--- a/wordpress_php8.4-fpm-alpine/Dockerfile
+++ b/wordpress_php8.4-fpm-alpine/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,7 +98,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.4-fpm/Dockerfile b/wordpress_php8.4-fpm/Dockerfile
index bd85559..484e7cf 100644
--- a/wordpress_php8.4-fpm/Dockerfile
+++ b/wordpress_php8.4-fpm/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_php8.4/Dockerfile b/wordpress_php8.4/Dockerfile
index 060592b..89ec0dc 100644
--- a/wordpress_php8.4/Dockerfile
+++ b/wordpress_php8.4/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
diff --git a/wordpress_php8.1-fpm-alpine/Dockerfile b/wordpress_php8.5-fpm-alpine/Dockerfile
similarity index 94%
copy from wordpress_php8.1-fpm-alpine/Dockerfile
copy to wordpress_php8.5-fpm-alpine/Dockerfile
index 868d4f4..1603406 100644
--- a/wordpress_php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_php8.5-fpm-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.1-fpm-alpine
+FROM php:8.5-fpm-alpine
 
 # persistent dependencies
 RUN set -eux; \
@@ -48,7 +48,7 @@ RUN set -ex; \
 	; \
 # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -76,16 +76,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -97,7 +98,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.5-fpm-alpine/docker-entrypoint.sh
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_php8.5-fpm-alpine/docker-entrypoint.sh
diff --git a/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php b/wordpress_php8.5-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_php8.5-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_php8.1-fpm/Dockerfile b/wordpress_php8.5-fpm/Dockerfile
similarity index 95%
copy from wordpress_php8.1-fpm/Dockerfile
copy to wordpress_php8.5-fpm/Dockerfile
index ad7b1d6..4f11deb 100644
--- a/wordpress_php8.1-fpm/Dockerfile
+++ b/wordpress_php8.5-fpm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.1-fpm
+FROM php:8.5-fpm
 
 # persistent dependencies
 RUN set -eux; \
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	version='6.8.3'; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.5-fpm/docker-entrypoint.sh
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_php8.5-fpm/docker-entrypoint.sh
diff --git a/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php b/wordpress_php8.5-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_php8.5-fpm/wp-config-docker.php
diff --git a/wordpress_php8.1/Dockerfile b/wordpress_php8.5/Dockerfile
similarity index 95%
copy from wordpress_php8.1/Dockerfile
copy to wordpress_php8.5/Dockerfile
index 696e787..4fb40cd 100644
--- a/wordpress_php8.1/Dockerfile
+++ b/wordpress_php8.5/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM php:8.1-apache
+FROM php:8.5-apache
 
 # persistent dependencies
 RUN set -eux; \
@@ -47,7 +47,7 @@ RUN set -ex; \
 		zip \
 	; \
 # https://pecl.php.net/package/imagick
-	pecl install imagick-3.8.0; \
+	pecl install imagick-3.8.1; \
 	docker-php-ext-enable imagick; \
 	rm -r /tmp/pear; \
 	\
@@ -80,16 +80,17 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
+# enabled by default in the php images: https://github.com/docker-library/php/pull/1587
 RUN set -eux; \
-	docker-php-ext-enable opcache; \
 	{ \
 		echo 'opcache.memory_consumption=128'; \
 		echo 'opcache.interned_strings_buffer=8'; \
 		echo 'opcache.max_accelerated_files=4000'; \
 		echo 'opcache.revalidate_freq=2'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+	} > "$PHP_INI_DIR/conf.d/opcache-recommended.ini"
 # https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
+RUN set -eux; \
+	{ \
 # https://www.php.net/manual/en/errorfunc.constants.php
 # https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
 		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
@@ -101,7 +102,7 @@ RUN { \
 		echo 'ignore_repeated_errors = On'; \
 		echo 'ignore_repeated_source = Off'; \
 		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
+	} > "$PHP_INI_DIR/conf.d/error-logging.ini"
 
 RUN set -eux; \
 	a2enmod rewrite expires; \
diff --git a/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.5/docker-entrypoint.sh
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_php8.5/docker-entrypoint.sh
diff --git a/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php b/wordpress_php8.5/wp-config-docker.php
similarity index 100%
copy from wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_php8.5/wp-config-docker.php

Relevant Maintainers:

@yosifkit yosifkit merged commit 6e4b404 into docker-library:master Dec 2, 2025
40 checks passed
@yosifkit yosifkit deleted the wordpress branch December 2, 2025 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants