From 447d7d60da6f91d656ac711dbab2a042e1b5b515 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 9 Jun 2025 16:45:55 -0700
Subject: [PATCH] Add `docker-ensure-installed.sh` as an explicit
 entrypoint/symlink

This allows using the image as `docker run --mount ... wordpress docker-ensure-installed.sh` which will then *just* ensure WordPress is installed in the volume and exit (successfully).

The primary use case for this is an `initContainer` in Kubernetes.
---
 Dockerfile.template                           | 4 ++++
 beta/php8.1/apache/Dockerfile                 | 2 ++
 beta/php8.1/apache/docker-entrypoint.sh       | 2 +-
 beta/php8.1/fpm-alpine/Dockerfile             | 2 ++
 beta/php8.1/fpm-alpine/docker-entrypoint.sh   | 2 +-
 beta/php8.1/fpm/Dockerfile                    | 2 ++
 beta/php8.1/fpm/docker-entrypoint.sh          | 2 +-
 beta/php8.2/apache/Dockerfile                 | 2 ++
 beta/php8.2/apache/docker-entrypoint.sh       | 2 +-
 beta/php8.2/fpm-alpine/Dockerfile             | 2 ++
 beta/php8.2/fpm-alpine/docker-entrypoint.sh   | 2 +-
 beta/php8.2/fpm/Dockerfile                    | 2 ++
 beta/php8.2/fpm/docker-entrypoint.sh          | 2 +-
 beta/php8.3/apache/Dockerfile                 | 2 ++
 beta/php8.3/apache/docker-entrypoint.sh       | 2 +-
 beta/php8.3/fpm-alpine/Dockerfile             | 2 ++
 beta/php8.3/fpm-alpine/docker-entrypoint.sh   | 2 +-
 beta/php8.3/fpm/Dockerfile                    | 2 ++
 beta/php8.3/fpm/docker-entrypoint.sh          | 2 +-
 beta/php8.4/apache/Dockerfile                 | 2 ++
 beta/php8.4/apache/docker-entrypoint.sh       | 2 +-
 beta/php8.4/fpm-alpine/Dockerfile             | 2 ++
 beta/php8.4/fpm-alpine/docker-entrypoint.sh   | 2 +-
 beta/php8.4/fpm/Dockerfile                    | 2 ++
 beta/php8.4/fpm/docker-entrypoint.sh          | 2 +-
 docker-entrypoint.sh                          | 2 +-
 latest/php8.1/apache/Dockerfile               | 2 ++
 latest/php8.1/apache/docker-entrypoint.sh     | 2 +-
 latest/php8.1/fpm-alpine/Dockerfile           | 2 ++
 latest/php8.1/fpm-alpine/docker-entrypoint.sh | 2 +-
 latest/php8.1/fpm/Dockerfile                  | 2 ++
 latest/php8.1/fpm/docker-entrypoint.sh        | 2 +-
 latest/php8.2/apache/Dockerfile               | 2 ++
 latest/php8.2/apache/docker-entrypoint.sh     | 2 +-
 latest/php8.2/fpm-alpine/Dockerfile           | 2 ++
 latest/php8.2/fpm-alpine/docker-entrypoint.sh | 2 +-
 latest/php8.2/fpm/Dockerfile                  | 2 ++
 latest/php8.2/fpm/docker-entrypoint.sh        | 2 +-
 latest/php8.3/apache/Dockerfile               | 2 ++
 latest/php8.3/apache/docker-entrypoint.sh     | 2 +-
 latest/php8.3/fpm-alpine/Dockerfile           | 2 ++
 latest/php8.3/fpm-alpine/docker-entrypoint.sh | 2 +-
 latest/php8.3/fpm/Dockerfile                  | 2 ++
 latest/php8.3/fpm/docker-entrypoint.sh        | 2 +-
 latest/php8.4/apache/Dockerfile               | 2 ++
 latest/php8.4/apache/docker-entrypoint.sh     | 2 +-
 latest/php8.4/fpm-alpine/Dockerfile           | 2 ++
 latest/php8.4/fpm-alpine/docker-entrypoint.sh | 2 +-
 latest/php8.4/fpm/Dockerfile                  | 2 ++
 latest/php8.4/fpm/docker-entrypoint.sh        | 2 +-
 50 files changed, 77 insertions(+), 25 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index a1001d1e99..ec89d40fee 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -257,6 +257,10 @@ VOLUME /var/www/html
 COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
 {{ ) else "" end -}}
 COPY docker-entrypoint.sh /usr/local/bin/
+{{ if env.version != "cli" then ( -}}
+# https://github.com/docker-library/wordpress/issues/969
+RUN ln -svfT docker-entrypoint.sh /usr/local/bin/docker-ensure-installed.sh
+{{ ) else "" end -}}
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 {{ if env.version != "cli" then ( -}}
diff --git a/beta/php8.1/apache/Dockerfile b/beta/php8.1/apache/Dockerfile
index ef7e825684..19aadc4393 100644
--- a/beta/php8.1/apache/Dockerfile
+++ b/beta/php8.1/apache/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/beta/php8.1/apache/docker-entrypoint.sh b/beta/php8.1/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.1/apache/docker-entrypoint.sh
+++ b/beta/php8.1/apache/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/beta/php8.1/fpm-alpine/Dockerfile b/beta/php8.1/fpm-alpine/Dockerfile
index 823d7e0e59..50e689c9d2 100644
--- a/beta/php8.1/fpm-alpine/Dockerfile
+++ b/beta/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/beta/php8.1/fpm-alpine/docker-entrypoint.sh b/beta/php8.1/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.1/fpm-alpine/docker-entrypoint.sh
+++ b/beta/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/beta/php8.1/fpm/Dockerfile b/beta/php8.1/fpm/Dockerfile
index 4f27dedd44..4418ee2286 100644
--- a/beta/php8.1/fpm/Dockerfile
+++ b/beta/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/beta/php8.1/fpm/docker-entrypoint.sh b/beta/php8.1/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.1/fpm/docker-entrypoint.sh
+++ b/beta/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/beta/php8.2/apache/Dockerfile b/beta/php8.2/apache/Dockerfile
index b23a951e27..aeb3eec177 100644
--- a/beta/php8.2/apache/Dockerfile
+++ b/beta/php8.2/apache/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/beta/php8.2/apache/docker-entrypoint.sh b/beta/php8.2/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.2/apache/docker-entrypoint.sh
+++ b/beta/php8.2/apache/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/beta/php8.2/fpm-alpine/Dockerfile b/beta/php8.2/fpm-alpine/Dockerfile
index 287510e2c2..3ba60981dc 100644
--- a/beta/php8.2/fpm-alpine/Dockerfile
+++ b/beta/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/beta/php8.2/fpm-alpine/docker-entrypoint.sh b/beta/php8.2/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.2/fpm-alpine/docker-entrypoint.sh
+++ b/beta/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/beta/php8.2/fpm/Dockerfile b/beta/php8.2/fpm/Dockerfile
index 7a2d30bb12..10fe26f462 100644
--- a/beta/php8.2/fpm/Dockerfile
+++ b/beta/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/beta/php8.2/fpm/docker-entrypoint.sh b/beta/php8.2/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.2/fpm/docker-entrypoint.sh
+++ b/beta/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/beta/php8.3/apache/Dockerfile b/beta/php8.3/apache/Dockerfile
index 0a067370ae..5a6a06e30d 100644
--- a/beta/php8.3/apache/Dockerfile
+++ b/beta/php8.3/apache/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/beta/php8.3/apache/docker-entrypoint.sh b/beta/php8.3/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.3/apache/docker-entrypoint.sh
+++ b/beta/php8.3/apache/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/beta/php8.3/fpm-alpine/Dockerfile b/beta/php8.3/fpm-alpine/Dockerfile
index b13c7ddae2..7381a5ed43 100644
--- a/beta/php8.3/fpm-alpine/Dockerfile
+++ b/beta/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/beta/php8.3/fpm-alpine/docker-entrypoint.sh b/beta/php8.3/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.3/fpm-alpine/docker-entrypoint.sh
+++ b/beta/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/beta/php8.3/fpm/Dockerfile b/beta/php8.3/fpm/Dockerfile
index 8e67f08d68..d48d86a647 100644
--- a/beta/php8.3/fpm/Dockerfile
+++ b/beta/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/beta/php8.3/fpm/docker-entrypoint.sh b/beta/php8.3/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.3/fpm/docker-entrypoint.sh
+++ b/beta/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/beta/php8.4/apache/Dockerfile b/beta/php8.4/apache/Dockerfile
index a5164475df..d17690cbaf 100644
--- a/beta/php8.4/apache/Dockerfile
+++ b/beta/php8.4/apache/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/beta/php8.4/apache/docker-entrypoint.sh b/beta/php8.4/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.4/apache/docker-entrypoint.sh
+++ b/beta/php8.4/apache/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/beta/php8.4/fpm-alpine/Dockerfile b/beta/php8.4/fpm-alpine/Dockerfile
index f275060c31..27e6c3b696 100644
--- a/beta/php8.4/fpm-alpine/Dockerfile
+++ b/beta/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/beta/php8.4/fpm-alpine/docker-entrypoint.sh b/beta/php8.4/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.4/fpm-alpine/docker-entrypoint.sh
+++ b/beta/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/beta/php8.4/fpm/Dockerfile b/beta/php8.4/fpm/Dockerfile
index 8276973323..3be4c4e0d2 100644
--- a/beta/php8.4/fpm/Dockerfile
+++ b/beta/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/beta/php8.4/fpm/docker-entrypoint.sh b/beta/php8.4/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/beta/php8.4/fpm/docker-entrypoint.sh
+++ b/beta/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/docker-entrypoint.sh b/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/docker-entrypoint.sh
+++ b/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/latest/php8.1/apache/Dockerfile b/latest/php8.1/apache/Dockerfile
index ef7e825684..19aadc4393 100644
--- a/latest/php8.1/apache/Dockerfile
+++ b/latest/php8.1/apache/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/latest/php8.1/apache/docker-entrypoint.sh b/latest/php8.1/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.1/apache/docker-entrypoint.sh
+++ b/latest/php8.1/apache/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/latest/php8.1/fpm-alpine/Dockerfile b/latest/php8.1/fpm-alpine/Dockerfile
index 823d7e0e59..50e689c9d2 100644
--- a/latest/php8.1/fpm-alpine/Dockerfile
+++ b/latest/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/latest/php8.1/fpm-alpine/docker-entrypoint.sh b/latest/php8.1/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.1/fpm-alpine/docker-entrypoint.sh
+++ b/latest/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/latest/php8.1/fpm/Dockerfile b/latest/php8.1/fpm/Dockerfile
index 4f27dedd44..4418ee2286 100644
--- a/latest/php8.1/fpm/Dockerfile
+++ b/latest/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/latest/php8.1/fpm/docker-entrypoint.sh b/latest/php8.1/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.1/fpm/docker-entrypoint.sh
+++ b/latest/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/latest/php8.2/apache/Dockerfile b/latest/php8.2/apache/Dockerfile
index b23a951e27..aeb3eec177 100644
--- a/latest/php8.2/apache/Dockerfile
+++ b/latest/php8.2/apache/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/latest/php8.2/apache/docker-entrypoint.sh b/latest/php8.2/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.2/apache/docker-entrypoint.sh
+++ b/latest/php8.2/apache/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/latest/php8.2/fpm-alpine/Dockerfile b/latest/php8.2/fpm-alpine/Dockerfile
index 287510e2c2..3ba60981dc 100644
--- a/latest/php8.2/fpm-alpine/Dockerfile
+++ b/latest/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/latest/php8.2/fpm-alpine/docker-entrypoint.sh b/latest/php8.2/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.2/fpm-alpine/docker-entrypoint.sh
+++ b/latest/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/latest/php8.2/fpm/Dockerfile b/latest/php8.2/fpm/Dockerfile
index 7a2d30bb12..10fe26f462 100644
--- a/latest/php8.2/fpm/Dockerfile
+++ b/latest/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/latest/php8.2/fpm/docker-entrypoint.sh b/latest/php8.2/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.2/fpm/docker-entrypoint.sh
+++ b/latest/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/latest/php8.3/apache/Dockerfile b/latest/php8.3/apache/Dockerfile
index 0a067370ae..5a6a06e30d 100644
--- a/latest/php8.3/apache/Dockerfile
+++ b/latest/php8.3/apache/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/latest/php8.3/apache/docker-entrypoint.sh b/latest/php8.3/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.3/apache/docker-entrypoint.sh
+++ b/latest/php8.3/apache/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/latest/php8.3/fpm-alpine/Dockerfile b/latest/php8.3/fpm-alpine/Dockerfile
index b13c7ddae2..7381a5ed43 100644
--- a/latest/php8.3/fpm-alpine/Dockerfile
+++ b/latest/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/latest/php8.3/fpm-alpine/docker-entrypoint.sh b/latest/php8.3/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.3/fpm-alpine/docker-entrypoint.sh
+++ b/latest/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/latest/php8.3/fpm/Dockerfile b/latest/php8.3/fpm/Dockerfile
index 8e67f08d68..d48d86a647 100644
--- a/latest/php8.3/fpm/Dockerfile
+++ b/latest/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/latest/php8.3/fpm/docker-entrypoint.sh b/latest/php8.3/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.3/fpm/docker-entrypoint.sh
+++ b/latest/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/latest/php8.4/apache/Dockerfile b/latest/php8.4/apache/Dockerfile
index a5164475df..d17690cbaf 100644
--- a/latest/php8.4/apache/Dockerfile
+++ b/latest/php8.4/apache/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/latest/php8.4/apache/docker-entrypoint.sh b/latest/php8.4/apache/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.4/apache/docker-entrypoint.sh
+++ b/latest/php8.4/apache/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/latest/php8.4/fpm-alpine/Dockerfile b/latest/php8.4/fpm-alpine/Dockerfile
index f275060c31..27e6c3b696 100644
--- a/latest/php8.4/fpm-alpine/Dockerfile
+++ b/latest/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/latest/php8.4/fpm-alpine/docker-entrypoint.sh b/latest/php8.4/fpm-alpine/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.4/fpm-alpine/docker-entrypoint.sh
+++ b/latest/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/latest/php8.4/fpm/Dockerfile b/latest/php8.4/fpm/Dockerfile
index 8276973323..3be4c4e0d2 100644
--- a/latest/php8.4/fpm/Dockerfile
+++ b/latest/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/latest/php8.4/fpm/docker-entrypoint.sh b/latest/php8.4/fpm/docker-entrypoint.sh
index 1034f1dec1..95d3a6d977 100755
--- a/latest/php8.4/fpm/docker-entrypoint.sh
+++ b/latest/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