From 62c7f146e4028019c16a460636e88efc51d2417f Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 21:13:02 +0000 Subject: [PATCH 1/6] Bumping version to 7.0.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4122521..73a86b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0 \ No newline at end of file +7.0.1 \ No newline at end of file From 122b597a12a2fa75e9c8fd7cfcf73dcbcb96dd20 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 21:13:15 +0000 Subject: [PATCH 2/6] Bumping version to 7.1.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 73a86b1..3769235 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.1 \ No newline at end of file +7.1.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 7104585..986084f 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -7.0 \ No newline at end of file +7.1 \ No newline at end of file From a01872cb593c4bc6219660e6bfd9ba8b5710edcd Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 21:14:48 +0000 Subject: [PATCH 3/6] Adding PHP 8.5 and making it the default --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 2 +- php8.5/Dockerfile | 47 +++++++++++++++++++++++++++++++++++ php8.5/PHP_REVISION | 1 + php8.5/overlay/.empty | 0 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 php8.5/Dockerfile create mode 100644 php8.5/PHP_REVISION create mode 100644 php8.5/overlay/.empty diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index ff50e2b..2006d0f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ] + php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8757f3d..a7590e5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ] + php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ] runs-on: ubuntu-latest steps: - diff --git a/php8.5/Dockerfile b/php8.5/Dockerfile new file mode 100644 index 0000000..17bcc0a --- /dev/null +++ b/php8.5/Dockerfile @@ -0,0 +1,47 @@ +FROM quay.io/bfren/nginx-php:php8.5.0-8.1.0 + +LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" + +ARG BF_IMAGE +ARG BF_PUBLISHING +ARG BF_VERSION + +ARG \ + # set to a valid WordPress version or the installation will fail + # if empty, will use value in /overlay/tmp/WP_VERSION + WP_VERSION= \ + # set to a valid WordPress locale or the installation will fail + # if empty, will use value in /overlay/tmp/WP_LOCALE + WP_LOCALE= + +COPY ./overlay / +COPY ./php8.5/overlay / + +ENV \ + # load the WordPress login page for healthcheck + BF_NGINX_HEALTHCHECK_URI=http://localhost/wp-login.php \ + # options for config file permissions: + # - 0 (make it writeable by web server user) + # - 1 (make it readonly to web server user) + BF_WP_CONFIG_HARDEN=1 \ + # options for config file generation: + # - 0 (generate on container startup if it does not exist) + # - 1 (always regenerate on container startup) + BF_WP_CONFIG_REGENERATE=1 \ + # set to 0 to re-enable WordPress core updates - otherwise they will be handled by the image + BF_WP_DISABLE_MAJOR_UPDATES=1 \ + # whether or not to enable HTTPS behind a proxy server + BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ + # set to 0 if you don't want the WebAuthn plugin to be installed automatically + BF_WP_INSTALL_WEBAUTHN=1 \ + # set to 0 to use WordPress cron instead of system cron (will reduce performance) + # you must remove define('DISABLE_WP_CRON', true); to wp-config.php to make a difference + BF_WP_USE_SYSTEM_CRON=1 + +RUN bf-install + +VOLUME [ "/wp-content" ] diff --git a/php8.5/PHP_REVISION b/php8.5/PHP_REVISION new file mode 100644 index 0000000..5eaed3b --- /dev/null +++ b/php8.5/PHP_REVISION @@ -0,0 +1 @@ +8.5.0 \ No newline at end of file diff --git a/php8.5/overlay/.empty b/php8.5/overlay/.empty new file mode 100644 index 0000000..e69de29 From 9686885c75ce5393afbe3e53a2d8e300cbd07005 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 21:15:00 +0000 Subject: [PATCH 4/6] Updating to PHP 8.3.28 and 8.4.15 --- php8.3/PHP_REVISION | 2 +- php8.4/PHP_REVISION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php8.3/PHP_REVISION b/php8.3/PHP_REVISION index eb43379..6b28411 100644 --- a/php8.3/PHP_REVISION +++ b/php8.3/PHP_REVISION @@ -1 +1 @@ -8.3.27 \ No newline at end of file +8.3.28 \ No newline at end of file diff --git a/php8.4/PHP_REVISION b/php8.4/PHP_REVISION index 478188d..79745a8 100644 --- a/php8.4/PHP_REVISION +++ b/php8.4/PHP_REVISION @@ -1 +1 @@ -8.4.14 \ No newline at end of file +8.4.15 \ No newline at end of file From 9e67badf018d00bb5c9d9d390b671032f1b763c8 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 21:15:14 +0000 Subject: [PATCH 5/6] Making PHP 8.5 the default --- run.sh | 2 +- test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 77ae32c..e157bbf 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ #!/bin/sh IMAGE=`cat VERSION` -PHP=${1:-php8.4} +PHP=${1:-php8.5} docker buildx build \ --load \ diff --git a/test.sh b/test.sh index 9c7de88..05e104c 100644 --- a/test.sh +++ b/test.sh @@ -2,7 +2,7 @@ IMAGE=wordpress VERSION=`cat VERSION` -PHP=${1:-8.4} +PHP=${1:-8.5} TAG=${IMAGE}-test docker buildx build \ From 8a858a28974507bcfd97155aa3e3c336b77ec5f4 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 21:15:17 +0000 Subject: [PATCH 6/6] Using latest base images --- generate-dockerfiles.sh | 4 ++-- php7.4/Dockerfile | 2 +- php8.0/Dockerfile | 2 +- php8.1/Dockerfile | 2 +- php8.2/Dockerfile | 2 +- php8.3/Dockerfile | 2 +- php8.4/Dockerfile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 6db801a..89ee8ed 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,10 +4,10 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="8.0.1" +BASE_VERSION="8.1.0" echo "Base: ${BASE_VERSION}" -PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" +PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do echo "WordPress for PHP ${V}" diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile index d7b8cef..97e7c12 100644 --- a/php7.4/Dockerfile +++ b/php7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php7.4.33-8.0.1 +FROM quay.io/bfren/nginx-php:php7.4.33-8.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile index feedd14..ecd27a2 100644 --- a/php8.0/Dockerfile +++ b/php8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.0.30-8.0.1 +FROM quay.io/bfren/nginx-php:php8.0.30-8.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.1/Dockerfile b/php8.1/Dockerfile index bdba7b7..8a05f1b 100644 --- a/php8.1/Dockerfile +++ b/php8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.1.32-8.0.1 +FROM quay.io/bfren/nginx-php:php8.1.32-8.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.2/Dockerfile b/php8.2/Dockerfile index 6b366ee..ca7a945 100644 --- a/php8.2/Dockerfile +++ b/php8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.2.29-8.0.1 +FROM quay.io/bfren/nginx-php:php8.2.29-8.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.3/Dockerfile b/php8.3/Dockerfile index 6455308..ebc6f31 100644 --- a/php8.3/Dockerfile +++ b/php8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.3.27-8.0.1 +FROM quay.io/bfren/nginx-php:php8.3.28-8.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress" diff --git a/php8.4/Dockerfile b/php8.4/Dockerfile index 6edb092..3041c80 100644 --- a/php8.4/Dockerfile +++ b/php8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/nginx-php:php8.4.14-8.0.1 +FROM quay.io/bfren/nginx-php:php8.4.15-8.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"