Update wordpress #19992
Merged
Update wordpress #19992
+72
−12
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/wordpress@13393cb: Update beta to 6.8.3 - docker-library/wordpress@d15b481: Merge pull request docker-library/wordpress#985 from infosiftr/fix-ensure-installed - docker-library/wordpress@ce303eb: Fix "unbound variable" error in `docker-ensure-installed.sh` - docker-library/wordpress@0fbecde: Add basic test for `docker-ensure-installed.sh` script
Diff for c830d29:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 45e529b..a41c552 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,64 +3,124 @@ GitRepo: https://github.com/docker-library/wordpress.git
Tags: 6.8.2-apache, 6.8-apache, 6-apache, apache, 6.8.2, 6.8, 6, latest, 6.8.2-php8.3-apache, 6.8-php8.3-apache, 6-php8.3-apache, php8.3-apache, 6.8.2-php8.3, 6.8-php8.3, 6-php8.3, php8.3
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.3/apache
Tags: 6.8.2-fpm, 6.8-fpm, 6-fpm, fpm, 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.3/fpm
Tags: 6.8.2-fpm-alpine, 6.8-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.3/fpm-alpine
Tags: 6.8.2-php8.1-apache, 6.8-php8.1-apache, 6-php8.1-apache, php8.1-apache, 6.8.2-php8.1, 6.8-php8.1, 6-php8.1, php8.1
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.1/apache
Tags: 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.1/fpm
Tags: 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.1/fpm-alpine
Tags: 6.8.2-php8.2-apache, 6.8-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.8.2-php8.2, 6.8-php8.2, 6-php8.2, php8.2
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.2/apache
Tags: 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.2/fpm
Tags: 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.2/fpm-alpine
Tags: 6.8.2-php8.4-apache, 6.8-php8.4-apache, 6-php8.4-apache, php8.4-apache, 6.8.2-php8.4, 6.8-php8.4, 6-php8.4, php8.4
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.4/apache
Tags: 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.4/fpm
Tags: 6.8.2-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: cb4dee629a6dbc942cb218f3d8516e71eb13b27e
+GitCommit: ce303ebfe1bd994b8ad54c8ce34686579ffdce41
Directory: latest/php8.4/fpm-alpine
+Tags: beta-6.8.3-apache, beta-6.8-apache, beta-6-apache, beta-apache, beta-6.8.3, beta-6.8, beta-6, beta, beta-6.8.3-php8.3-apache, beta-6.8-php8.3-apache, beta-6-php8.3-apache, beta-php8.3-apache, beta-6.8.3-php8.3, beta-6.8-php8.3, beta-6-php8.3, beta-php8.3
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.3/apache
+
+Tags: beta-6.8.3-fpm, beta-6.8-fpm, beta-6-fpm, beta-fpm, beta-6.8.3-php8.3-fpm, beta-6.8-php8.3-fpm, beta-6-php8.3-fpm, beta-php8.3-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.3/fpm
+
+Tags: beta-6.8.3-fpm-alpine, beta-6.8-fpm-alpine, beta-6-fpm-alpine, beta-fpm-alpine, beta-6.8.3-php8.3-fpm-alpine, beta-6.8-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: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.3/fpm-alpine
+
+Tags: beta-6.8.3-php8.1-apache, beta-6.8-php8.1-apache, beta-6-php8.1-apache, beta-php8.1-apache, beta-6.8.3-php8.1, beta-6.8-php8.1, beta-6-php8.1, beta-php8.1
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.1/apache
+
+Tags: beta-6.8.3-php8.1-fpm, beta-6.8-php8.1-fpm, beta-6-php8.1-fpm, beta-php8.1-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.1/fpm
+
+Tags: beta-6.8.3-php8.1-fpm-alpine, beta-6.8-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: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.1/fpm-alpine
+
+Tags: beta-6.8.3-php8.2-apache, beta-6.8-php8.2-apache, beta-6-php8.2-apache, beta-php8.2-apache, beta-6.8.3-php8.2, beta-6.8-php8.2, beta-6-php8.2, beta-php8.2
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.2/apache
+
+Tags: beta-6.8.3-php8.2-fpm, beta-6.8-php8.2-fpm, beta-6-php8.2-fpm, beta-php8.2-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.2/fpm
+
+Tags: beta-6.8.3-php8.2-fpm-alpine, beta-6.8-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: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.2/fpm-alpine
+
+Tags: beta-6.8.3-php8.4-apache, beta-6.8-php8.4-apache, beta-6-php8.4-apache, beta-php8.4-apache, beta-6.8.3-php8.4, beta-6.8-php8.4, beta-6-php8.4, beta-php8.4
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.4/apache
+
+Tags: beta-6.8.3-php8.4-fpm, beta-6.8-php8.4-fpm, beta-6-php8.4-fpm, beta-php8.4-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.4/fpm
+
+Tags: beta-6.8.3-php8.4-fpm-alpine, beta-6.8-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: 13393cbd5cc7539a26ddefab00e48a5bdbfa260b
+Directory: beta/php8.4/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
diff --git a/_bashbrew-list b/_bashbrew-list
index 3bb6f0e..ce4ab7c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -59,6 +59,86 @@ wordpress:6.8.2-php8.4-apache
wordpress:6.8.2-php8.4-fpm
wordpress:6.8.2-php8.4-fpm-alpine
wordpress:apache
+wordpress:beta
+wordpress:beta-6
+wordpress:beta-6-apache
+wordpress:beta-6-fpm
+wordpress:beta-6-fpm-alpine
+wordpress:beta-6-php8.1
+wordpress:beta-6-php8.1-apache
+wordpress:beta-6-php8.1-fpm
+wordpress:beta-6-php8.1-fpm-alpine
+wordpress:beta-6-php8.2
+wordpress:beta-6-php8.2-apache
+wordpress:beta-6-php8.2-fpm
+wordpress:beta-6-php8.2-fpm-alpine
+wordpress:beta-6-php8.3
+wordpress:beta-6-php8.3-apache
+wordpress:beta-6-php8.3-fpm
+wordpress:beta-6-php8.3-fpm-alpine
+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.8
+wordpress:beta-6.8-apache
+wordpress:beta-6.8-fpm
+wordpress:beta-6.8-fpm-alpine
+wordpress:beta-6.8-php8.1
+wordpress:beta-6.8-php8.1-apache
+wordpress:beta-6.8-php8.1-fpm
+wordpress:beta-6.8-php8.1-fpm-alpine
+wordpress:beta-6.8-php8.2
+wordpress:beta-6.8-php8.2-apache
+wordpress:beta-6.8-php8.2-fpm
+wordpress:beta-6.8-php8.2-fpm-alpine
+wordpress:beta-6.8-php8.3
+wordpress:beta-6.8-php8.3-apache
+wordpress:beta-6.8-php8.3-fpm
+wordpress:beta-6.8-php8.3-fpm-alpine
+wordpress:beta-6.8-php8.4
+wordpress:beta-6.8-php8.4-apache
+wordpress:beta-6.8-php8.4-fpm
+wordpress:beta-6.8-php8.4-fpm-alpine
+wordpress:beta-6.8.3
+wordpress:beta-6.8.3-apache
+wordpress:beta-6.8.3-fpm
+wordpress:beta-6.8.3-fpm-alpine
+wordpress:beta-6.8.3-php8.1
+wordpress:beta-6.8.3-php8.1-apache
+wordpress:beta-6.8.3-php8.1-fpm
+wordpress:beta-6.8.3-php8.1-fpm-alpine
+wordpress:beta-6.8.3-php8.2
+wordpress:beta-6.8.3-php8.2-apache
+wordpress:beta-6.8.3-php8.2-fpm
+wordpress:beta-6.8.3-php8.2-fpm-alpine
+wordpress:beta-6.8.3-php8.3
+wordpress:beta-6.8.3-php8.3-apache
+wordpress:beta-6.8.3-php8.3-fpm
+wordpress:beta-6.8.3-php8.3-fpm-alpine
+wordpress:beta-6.8.3-php8.4
+wordpress:beta-6.8.3-php8.4-apache
+wordpress:beta-6.8.3-php8.4-fpm
+wordpress:beta-6.8.3-php8.4-fpm-alpine
+wordpress:beta-apache
+wordpress:beta-fpm
+wordpress:beta-fpm-alpine
+wordpress:beta-php8.1
+wordpress:beta-php8.1-apache
+wordpress:beta-php8.1-fpm
+wordpress:beta-php8.1-fpm-alpine
+wordpress:beta-php8.2
+wordpress:beta-php8.2-apache
+wordpress:beta-php8.2-fpm
+wordpress:beta-php8.2-fpm-alpine
+wordpress:beta-php8.3
+wordpress:beta-php8.3-apache
+wordpress:beta-php8.3-fpm
+wordpress:beta-php8.3-fpm-alpine
+wordpress:beta-php8.4
+wordpress:beta-php8.4-apache
+wordpress:beta-php8.4-fpm
+wordpress:beta-php8.4-fpm-alpine
wordpress:cli
wordpress:cli-2
wordpress:cli-2-php8.1
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c4623ff..33d8bd9 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,15 @@
+wordpress:beta-php8.1
+wordpress:beta-php8.1-fpm
+wordpress:beta-php8.1-fpm-alpine
+wordpress:beta-php8.2
+wordpress:beta-php8.2-fpm
+wordpress:beta-php8.2-fpm-alpine
+wordpress:beta-php8.3
+wordpress:beta-php8.3-fpm
+wordpress:beta-php8.3-fpm-alpine
+wordpress:beta-php8.4
+wordpress:beta-php8.4-fpm
+wordpress:beta-php8.4-fpm-alpine
wordpress:cli-php8.1
wordpress:cli-php8.2
wordpress:cli-php8.3
diff --git a/wordpress_php8.1-fpm-alpine/Dockerfile b/wordpress_beta-php8.1-fpm-alpine/Dockerfile
similarity index 98%
copy from wordpress_php8.1-fpm-alpine/Dockerfile
copy to wordpress_beta-php8.1-fpm-alpine/Dockerfile
index 39909a9..868d4f4 100644
--- a/wordpress_php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.1-fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.1-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.1-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_php8.1-fpm/Dockerfile b/wordpress_beta-php8.1-fpm/Dockerfile
similarity index 98%
copy from wordpress_php8.1-fpm/Dockerfile
copy to wordpress_beta-php8.1-fpm/Dockerfile
index 1843409..ad7b1d6 100644
--- a/wordpress_php8.1-fpm/Dockerfile
+++ b/wordpress_beta-php8.1-fpm/Dockerfile
@@ -104,8 +104,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.1-fpm/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.1-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.1-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.1-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.1-fpm/wp-config-docker.php
diff --git a/wordpress_php8.1/Dockerfile b/wordpress_beta-php8.1/Dockerfile
similarity index 98%
copy from wordpress_php8.1/Dockerfile
copy to wordpress_beta-php8.1/Dockerfile
index a32ea4c..696e787 100644
--- a/wordpress_php8.1/Dockerfile
+++ b/wordpress_beta-php8.1/Dockerfile
@@ -123,8 +123,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.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.1/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.1/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.1/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.1/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.1/wp-config-docker.php
diff --git a/wordpress_php8.2-fpm-alpine/Dockerfile b/wordpress_beta-php8.2-fpm-alpine/Dockerfile
similarity index 98%
copy from wordpress_php8.2-fpm-alpine/Dockerfile
copy to wordpress_beta-php8.2-fpm-alpine/Dockerfile
index a1cf29e..0f821b9 100644
--- a/wordpress_php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.2-fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.2-fpm-alpine/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.2-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.2-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.2-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.2-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_php8.2-fpm/Dockerfile b/wordpress_beta-php8.2-fpm/Dockerfile
similarity index 98%
copy from wordpress_php8.2-fpm/Dockerfile
copy to wordpress_beta-php8.2-fpm/Dockerfile
index ccf4bd3..9fe5bbd 100644
--- a/wordpress_php8.2-fpm/Dockerfile
+++ b/wordpress_beta-php8.2-fpm/Dockerfile
@@ -104,8 +104,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.2-fpm/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.2-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.2-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.2-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.2-fpm/wp-config-docker.php
diff --git a/wordpress_php8.2/Dockerfile b/wordpress_beta-php8.2/Dockerfile
similarity index 98%
copy from wordpress_php8.2/Dockerfile
copy to wordpress_beta-php8.2/Dockerfile
index b0ec1b5..15cda0b 100644
--- a/wordpress_php8.2/Dockerfile
+++ b/wordpress_beta-php8.2/Dockerfile
@@ -123,8 +123,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.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.2/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.2/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.2/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.2/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.2/wp-config-docker.php
diff --git a/wordpress_php8.3-fpm-alpine/Dockerfile b/wordpress_beta-php8.3-fpm-alpine/Dockerfile
similarity index 98%
copy from wordpress_php8.3-fpm-alpine/Dockerfile
copy to wordpress_beta-php8.3-fpm-alpine/Dockerfile
index 99cd78c..15239cf 100644
--- a/wordpress_php8.3-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.3-fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.3-fpm-alpine/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.3-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.3-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.3-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.3-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_php8.3-fpm/Dockerfile b/wordpress_beta-php8.3-fpm/Dockerfile
similarity index 98%
copy from wordpress_php8.3-fpm/Dockerfile
copy to wordpress_beta-php8.3-fpm/Dockerfile
index 66dfac3..990d151 100644
--- a/wordpress_php8.3-fpm/Dockerfile
+++ b/wordpress_beta-php8.3-fpm/Dockerfile
@@ -104,8 +104,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.3-fpm/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.3-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.3-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.3-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.3-fpm/wp-config-docker.php
diff --git a/wordpress_php8.3/Dockerfile b/wordpress_beta-php8.3/Dockerfile
similarity index 98%
copy from wordpress_php8.3/Dockerfile
copy to wordpress_beta-php8.3/Dockerfile
index 12eee74..43fd2d4 100644
--- a/wordpress_php8.3/Dockerfile
+++ b/wordpress_beta-php8.3/Dockerfile
@@ -123,8 +123,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.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.3/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.3/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.3/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.3/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.3/wp-config-docker.php
diff --git a/wordpress_php8.4-fpm-alpine/Dockerfile b/wordpress_beta-php8.4-fpm-alpine/Dockerfile
similarity index 98%
copy from wordpress_php8.4-fpm-alpine/Dockerfile
copy to wordpress_beta-php8.4-fpm-alpine/Dockerfile
index 924675d..33a920f 100644
--- a/wordpress_php8.4-fpm-alpine/Dockerfile
+++ b/wordpress_beta-php8.4-fpm-alpine/Dockerfile
@@ -100,8 +100,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.4-fpm-alpine/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.4-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.4-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.4-fpm-alpine/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.4-fpm-alpine/wp-config-docker.php
diff --git a/wordpress_php8.4-fpm/Dockerfile b/wordpress_beta-php8.4-fpm/Dockerfile
similarity index 98%
copy from wordpress_php8.4-fpm/Dockerfile
copy to wordpress_beta-php8.4-fpm/Dockerfile
index 51c9d35..bd85559 100644
--- a/wordpress_php8.4-fpm/Dockerfile
+++ b/wordpress_beta-php8.4-fpm/Dockerfile
@@ -104,8 +104,8 @@ RUN { \
} > /usr/local/etc/php/conf.d/error-logging.ini
RUN set -eux; \
- version='6.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.4-fpm/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.4-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.4-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.4-fpm/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.4-fpm/wp-config-docker.php
diff --git a/wordpress_php8.4/Dockerfile b/wordpress_beta-php8.4/Dockerfile
similarity index 98%
copy from wordpress_php8.4/Dockerfile
copy to wordpress_beta-php8.4/Dockerfile
index 4368020..060592b 100644
--- a/wordpress_php8.4/Dockerfile
+++ b/wordpress_beta-php8.4/Dockerfile
@@ -123,8 +123,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.8.2'; \
- sha1='03baad10b8f9a416a3e10b89010d811d9361e468'; \
+ version='6.8.3'; \
+ sha1='fd56bcdc15f1877e45dce67942ea75949ed650e8'; \
\
curl -o wordpress.tar.gz -fL "https://wordpress.org/wordpress-$version.tar.gz"; \
echo "$sha1 *wordpress.tar.gz" | sha1sum -c -; \
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_beta-php8.4/docker-entrypoint.sh
similarity index 95%
copy from wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
copy to wordpress_beta-php8.4/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_beta-php8.4/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm-alpine/wp-config-docker.php b/wordpress_beta-php8.4/wp-config-docker.php
similarity index 100%
copy from wordpress_php8.1-fpm-alpine/wp-config-docker.php
copy to wordpress_beta-php8.4/wp-config-docker.php
diff --git a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.1-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1-fpm/docker-entrypoint.sh b/wordpress_php8.1-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.1-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.1/docker-entrypoint.sh b/wordpress_php8.1/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.1/docker-entrypoint.sh
+++ b/wordpress_php8.1/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.2-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.2-fpm/docker-entrypoint.sh b/wordpress_php8.2-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.2-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.2-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.2/docker-entrypoint.sh b/wordpress_php8.2/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.2/docker-entrypoint.sh
+++ b/wordpress_php8.2/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.3-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.3-fpm/docker-entrypoint.sh b/wordpress_php8.3-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.3-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.3-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.3/docker-entrypoint.sh b/wordpress_php8.3/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.3/docker-entrypoint.sh
+++ b/wordpress_php8.3/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh b/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh
+++ b/wordpress_php8.4-fpm-alpine/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.4-fpm/docker-entrypoint.sh b/wordpress_php8.4-fpm/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.4-fpm/docker-entrypoint.sh
+++ b/wordpress_php8.4-fpm/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"
diff --git a/wordpress_php8.4/docker-entrypoint.sh b/wordpress_php8.4/docker-entrypoint.sh
index 95d3a6d..dad7303 100755
--- a/wordpress_php8.4/docker-entrypoint.sh
+++ b/wordpress_php8.4/docker-entrypoint.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
set -Eeuo pipefail
-if [[ "$1" == apache2* ]] || [ "$1" = 'php-fpm' ] || { self="$(basename "$0")" && [ "$self" = 'docker-ensure-installed.sh' ]; }; 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
- case "$1" in
+ case "${1-}" in
apache2*)
user="${APACHE_RUN_USER:-www-data}"
group="${APACHE_RUN_GROUP:-www-data}"Relevant Maintainers: |
yosifkit
approved these changes
Sep 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
docker-ensure-installed.shscript wordpress#985 from infosiftr/fix-ensure-installeddocker-ensure-installed.shdocker-ensure-installed.shscript