Skip to content

Update wordpress #19354

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2025
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 30, 2025

Changes:

Changes:

- docker-library/wordpress@97b58bf: Merge pull request docker-library/wordpress#971 from infosiftr/docker-ensure-installed
- docker-library/wordpress@447d7d6: Add `docker-ensure-installed.sh` as an explicit entrypoint/symlink
@tianon tianon requested a review from a team as a code owner June 30, 2025 16:49
Copy link

Diff for e76c7bf:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e869da9..8c08449 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,62 +3,62 @@ GitRepo: https://github.com/docker-library/wordpress.git
 
 Tags: 6.8.1-apache, 6.8-apache, 6-apache, apache, 6.8.1, 6.8, 6, latest, 6.8.1-php8.2-apache, 6.8-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.8.1-php8.2, 6.8-php8.2, 6-php8.2, php8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.2/apache
 
 Tags: 6.8.1-fpm, 6.8-fpm, 6-fpm, fpm, 6.8.1-php8.2-fpm, 6.8-php8.2-fpm, 6-php8.2-fpm, php8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.2/fpm
 
 Tags: 6.8.1-fpm-alpine, 6.8-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.8.1-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: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.2/fpm-alpine
 
 Tags: 6.8.1-php8.1-apache, 6.8-php8.1-apache, 6-php8.1-apache, php8.1-apache, 6.8.1-php8.1, 6.8-php8.1, 6-php8.1, php8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.1/apache
 
 Tags: 6.8.1-php8.1-fpm, 6.8-php8.1-fpm, 6-php8.1-fpm, php8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.1/fpm
 
 Tags: 6.8.1-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: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.1/fpm-alpine
 
 Tags: 6.8.1-php8.3-apache, 6.8-php8.3-apache, 6-php8.3-apache, php8.3-apache, 6.8.1-php8.3, 6.8-php8.3, 6-php8.3, php8.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.3/apache
 
 Tags: 6.8.1-php8.3-fpm, 6.8-php8.3-fpm, 6-php8.3-fpm, php8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.3/fpm
 
 Tags: 6.8.1-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: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.3/fpm-alpine
 
 Tags: 6.8.1-php8.4-apache, 6.8-php8.4-apache, 6-php8.4-apache, php8.4-apache, 6.8.1-php8.4, 6.8-php8.4, 6-php8.4, php8.4
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.4/apache
 
 Tags: 6.8.1-php8.4-fpm, 6.8-php8.4-fpm, 6-php8.4-fpm, php8.4-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.4/fpm
 
 Tags: 6.8.1-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: b8721d7271bf763d999285985277d61e78c584aa
+GitCommit: 447d7d60da6f91d656ac711dbab2a042e1b5b515
 Directory: latest/php8.4/fpm-alpine
 
 Tags: cli-2.12.0, cli-2.12, cli-2, cli, cli-2.12.0-php8.2, cli-2.12-php8.2, cli-2-php8.2, cli-php8.2
diff --git a/wordpress_php8.1-fpm-alpine/Dockerfile b/wordpress_php8.1-fpm-alpine/Dockerfile
index 823d7e0..50e689c 100644
--- a/wordpress_php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_php8.1-fpm-alpine/Dockerfile
@@ -141,6 +141,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.1-fpm/Dockerfile b/wordpress_php8.1-fpm/Dockerfile
index 4f27ded..4418ee2 100644
--- a/wordpress_php8.1-fpm/Dockerfile
+++ b/wordpress_php8.1-fpm/Dockerfile
@@ -145,6 +145,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.1-fpm/docker-entrypoint.sh b/wordpress_php8.1-fpm/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.1-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.1-fpm/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.1/Dockerfile b/wordpress_php8.1/Dockerfile
index ef7e825..19aadc4 100644
--- a/wordpress_php8.1/Dockerfile
+++ b/wordpress_php8.1/Dockerfile
@@ -164,6 +164,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/wordpress_php8.1/docker-entrypoint.sh b/wordpress_php8.1/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.1/docker-entrypoint.sh
+++ b/wordpress_php8.1/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.2-fpm-alpine/Dockerfile b/wordpress_php8.2-fpm-alpine/Dockerfile
index 287510e..3ba6098 100644
--- a/wordpress_php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_php8.2-fpm-alpine/Dockerfile
@@ -141,6 +141,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.2-fpm/Dockerfile b/wordpress_php8.2-fpm/Dockerfile
index 7a2d30b..10fe26f 100644
--- a/wordpress_php8.2-fpm/Dockerfile
+++ b/wordpress_php8.2-fpm/Dockerfile
@@ -145,6 +145,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.2-fpm/docker-entrypoint.sh b/wordpress_php8.2-fpm/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.2-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.2-fpm/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.2/Dockerfile b/wordpress_php8.2/Dockerfile
index b23a951..aeb3eec 100644
--- a/wordpress_php8.2/Dockerfile
+++ b/wordpress_php8.2/Dockerfile
@@ -164,6 +164,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/wordpress_php8.2/docker-entrypoint.sh b/wordpress_php8.2/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.2/docker-entrypoint.sh
+++ b/wordpress_php8.2/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.3-fpm-alpine/Dockerfile b/wordpress_php8.3-fpm-alpine/Dockerfile
index b13c7dd..7381a5e 100644
--- a/wordpress_php8.3-fpm-alpine/Dockerfile
+++ b/wordpress_php8.3-fpm-alpine/Dockerfile
@@ -141,6 +141,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.3-fpm/Dockerfile b/wordpress_php8.3-fpm/Dockerfile
index 8e67f08..d48d86a 100644
--- a/wordpress_php8.3-fpm/Dockerfile
+++ b/wordpress_php8.3-fpm/Dockerfile
@@ -145,6 +145,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.3-fpm/docker-entrypoint.sh b/wordpress_php8.3-fpm/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.3-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.3-fpm/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.3/Dockerfile b/wordpress_php8.3/Dockerfile
index 0a06737..5a6a06e 100644
--- a/wordpress_php8.3/Dockerfile
+++ b/wordpress_php8.3/Dockerfile
@@ -164,6 +164,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/wordpress_php8.3/docker-entrypoint.sh b/wordpress_php8.3/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.3/docker-entrypoint.sh
+++ b/wordpress_php8.3/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.4-fpm-alpine/Dockerfile b/wordpress_php8.4-fpm-alpine/Dockerfile
index f275060..27e6c3b 100644
--- a/wordpress_php8.4-fpm-alpine/Dockerfile
+++ b/wordpress_php8.4-fpm-alpine/Dockerfile
@@ -141,6 +141,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.4-fpm/Dockerfile b/wordpress_php8.4-fpm/Dockerfile
index 8276973..3be4c4e 100644
--- a/wordpress_php8.4-fpm/Dockerfile
+++ b/wordpress_php8.4-fpm/Dockerfile
@@ -145,6 +145,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/wordpress_php8.4-fpm/docker-entrypoint.sh b/wordpress_php8.4-fpm/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.4-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.4-fpm/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then
diff --git a/wordpress_php8.4/Dockerfile b/wordpress_php8.4/Dockerfile
index a516447..d17690c 100644
--- a/wordpress_php8.4/Dockerfile
+++ b/wordpress_php8.4/Dockerfile
@@ -164,6 +164,8 @@ VOLUME /var/www/html
 
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 COPY docker-entrypoint.sh /usr/local/bin/
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/wordpress_php8.4/docker-entrypoint.sh b/wordpress_php8.4/docker-entrypoint.sh
index 1034f1d..95d3a6d 100755
--- a/wordpress_php8.4/docker-entrypoint.sh
+++ b/wordpress_php8.4/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ]; then
+if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; then
 	uid="$(id -u)"
 	gid="$(id -g)"
 	if [ "$uid" = '0' ]; then

Relevant Maintainers:

@yosifkit yosifkit merged commit bc9061f into docker-library:master Jun 30, 2025
21 checks passed
@yosifkit yosifkit deleted the wordpress branch June 30, 2025 17:33
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