v7.1.0 (#274)

bfren · web-flow · commit 403b7592aac2 · 2025-12-05T21:25:02.000Z
Major updates
* Using latest base images
* Adding PHP 8.5 and making it the default

Minor updates
* Updating to PHP 8.3.28 and 8.4.15
diff --git 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
@@ -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/VERSION b/VERSION
@@ -1 +1 @@
-7.0.0
+7.1.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-7.0
+7.1
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.3/PHP_REVISION b/php8.3/PHP_REVISION
@@ -1 +1 @@
-8.3.27
+8.3.28
diff --git 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"
 
diff --git a/php8.4/PHP_REVISION b/php8.4/PHP_REVISION
@@ -1 +1 @@
-8.4.14
+8.4.15
diff --git a/php8.5/Dockerfile 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
@@ -0,0 +1 @@
+8.5.0
diff --git a/php8.5/overlay/.empty b/php8.5/overlay/.empty
diff --git 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
@@ -2,7 +2,7 @@
 
 IMAGE=wordpress
 VERSION=`cat VERSION`
-PHP=${1:-8.4}
+PHP=${1:-8.5}
 TAG=${IMAGE}-test
 
 docker buildx build \

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ jobs:`
`14`	`14`	`strategy:`
`15`	`15`	`fail-fast: false`
`16`	`16`	`matrix:`
`17`		`- php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]`
	`17`	`+ php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]`
`18`	`18`	`runs-on: ubuntu-latest`
`19`	`19`	`steps:`
`20`	`20`	`-`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ jobs:`
`10`	`10`	`strategy:`
`11`	`11`	`fail-fast: false`
`12`	`12`	`matrix:`
`13`		`- php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]`
	`13`	`+ php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]`
`14`	`14`	`runs-on: ubuntu-latest`
`15`	`15`	`steps:`
`16`	`16`	`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/bfren/nginx-php:php7.4.33-8.0.1`
	`1`	`+FROM quay.io/bfren/nginx-php:php7.4.33-8.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/bfren/nginx-php:php8.0.30-8.0.1`
	`1`	`+FROM quay.io/bfren/nginx-php:php8.0.30-8.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/bfren/nginx-php:php8.1.32-8.0.1`
	`1`	`+FROM quay.io/bfren/nginx-php:php8.1.32-8.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/bfren/nginx-php:php8.2.29-8.0.1`
	`1`	`+FROM quay.io/bfren/nginx-php:php8.2.29-8.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/bfren/nginx-php:php8.3.27-8.0.1`
	`1`	`+FROM quay.io/bfren/nginx-php:php8.3.28-8.1.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wordpress"`
`4`	`4`