v7.5.0 (#238)

bfren · web-flow · commit 70d8aa2b1a19 · 2025-09-12T13:34:39.000+01:00
Major updates
* Changing the way PHP ini / conf values are overridden (**BREAKING CHANGE**)
* Adding opcache and jit support

Minor updates
* Using latest base images
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.4.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.6 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.4.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.6 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.4.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.6 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.4.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.4.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.4/Dockerfile b/8.4/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /tmp
 RUN \
     # get the Nu scripts from the PHP image overlay
     echo "Cloning Alpine overlay." && \
-    apk add git && git clone --branch v2.4.4 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.5 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
@@ -17,7 +17,7 @@ RUN \
 # STAGE 1: create final image
 #======================================================================================================================
 
-FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.6 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Nginx plus PHP (7.4, 8.0, 8.1, 8.2 and 8.3) - no SSL support etc, designed to be
 * `php-fpm`
 * `php-session`
 
-Nginx is setup by default to run PHP in FPM mode.  To override values in www.conf map a `www-conf.json` file to root - see `www-conf-sample.json`.  Values in the php.ini file can be overridden in the same way - see [Docker PHP](https://github.com/bfren/docker-php) for more information and a sample file.
+Nginx is setup by default to run PHP in FPM mode.  To override values in www.conf map a `xx.json` file to `/etc/bf/php-fpm.d` - see `www-conf-sample.json`.  Values in the php.ini file can be overridden in the same way - see [Docker PHP](https://github.com/bfren/docker-php) for more information and a sample file.
 
 ## Contents
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.4.4
+7.5.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-7.4
+7.5
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="6.5.5"
-PHP_BRANCH="v2.4.4"
+BASE_VERSION="6.5.6"
+PHP_BRANCH="v2.4.5"
 PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4"
 
 for V in ${PHP_VERSIONS} ; do
diff --git a/overlay/etc/bf/init.d/20-env.nu b/overlay/etc/bf/init.d/20-env.nu
@@ -3,10 +3,10 @@ bf env load
 
 # Set environment variables
 def main [] {
-    let ini_override = "/php-ini.json"
-    let fpm_override = "/www-conf.json"
-    bf env set PHP_INI_OVERRIDE $ini_override
-    bf env set PHP_FPM_OVERRIDE $fpm_override
+    let ini_override = $"(bf env ETC)/php.d"
+    let fpm_override = $"(bf env ETC)/php-fpm.d"
+    bf env set PHP_INI_OVERRIDE_D $ini_override
+    bf env set PHP_FPM_OVERRIDE_D $fpm_override
 
     let fpm_d = $"(bf env PHP_DIR)/php-fpm.d"
     bf env set PHP_FPM_D $fpm_d
diff --git a/overlay/etc/bf/init.d/22-php-ini.nu b/overlay/etc/bf/init.d/22-php-ini.nu
@@ -2,12 +2,12 @@ use bf
 use bf-php
 bf env load
 
-# Download and setup php.ini
+# Apply any overrides to php.ini
 export def main [] {
-    # if there is an override file, use it - otherwise use defaults
-    let override_file = bf env PHP_INI_OVERRIDE
-    let override_values = if ($override_file | path exists) { bf fs read $override_file | from json }
-
-    # download php.ini file and apply override values
-    bf-php ini $override_values
+    # load any override files and apply them
+    let ini_override = bf env PHP_INI_OVERRIDE_D
+    if ($ini_override | path exists) { $"($ini_override)/*.json" | into glob | ls --full-paths $in | get name | sort | each {|x|
+        let override_values = bf fs read $x | from json
+        bf-php ini $override_values
+    } }
 }
diff --git a/overlay/etc/bf/init.d/23-www-conf.nu b/overlay/etc/bf/init.d/23-www-conf.nu
@@ -2,15 +2,15 @@ use bf
 use bf-php
 bf env load
 
-# Setup www.conf
+# Apply any overrides to www.conf
 export def main [] {
-    # set user / group to www
+    # PHP-FPM configuration file
     let fpm_conf = bf env PHP_FPM_CONF
-    let www = "www"
-    bf-php ini insert_or_replace_values_in_file $fpm_conf {user: $www, group: $www}
 
-    # if there is an override file, use it
-    let override_file = bf env PHP_FPM_OVERRIDE
-    let override_values = if ($override_file | path exists) { bf fs read $override_file | from json }
-    bf-php ini insert_or_replace_values_in_file $fpm_conf $override_values
+    # load any override files and apply them
+    let fpm_override = bf env PHP_FPM_OVERRIDE_D
+    if ($fpm_override | path exists) { $"($fpm_override)/*.json" | into glob | ls --full-paths $in | get name | sort | each {|x|
+        let override_values = bf fs read $x | from json
+        bf-php ini insert_or_replace_values_in_file $fpm_conf $override_values
+    } }
 }
diff --git a/overlay/etc/bf/php-fpm.d/00-www-conf.json b/overlay/etc/bf/php-fpm.d/00-www-conf.json
diff --git a/overlay/etc/bf/php.d/00-php-ini.json b/overlay/etc/bf/php.d/00-php-ini.json
@@ -0,0 +1,6 @@
+{
+    "allow_url_fopen": "Off",
+    "disable_functions": "phpinfo",
+    "error_log": "",
+    "memory_limit": "256M"
+}
diff --git a/overlay/etc/bf/php.d/01-session.json b/overlay/etc/bf/php.d/01-session.json
@@ -0,0 +1,7 @@
+{
+    "session.cookie_httponly": "1",
+    "session.cookie_secure": "1",
+    "session.gc_maxlifetime": "86400",
+    "session.name": "bf-nginx-php-sessid",
+    "session.use_strict_mode": "1"
+}
diff --git a/overlay/etc/bf/php.d/02-upload.json b/overlay/etc/bf/php.d/02-upload.json
@@ -0,0 +1,4 @@
+{
+    "post_max_size": "64M",
+    "upload_max_filesize": "64M"
+}
diff --git a/overlay/etc/bf/php.d/03-jit.json b/overlay/etc/bf/php.d/03-jit.json
@@ -0,0 +1,5 @@
+{
+    "opcache.enable": "1",
+    "opcache.jit": "tracing",
+    "opcache.jit_buffer_size": "128M"
+}
diff --git a/overlay/php-ini.json b/overlay/php-ini.json
diff --git a/overlay/tmp/install b/overlay/tmp/install
@@ -13,6 +13,7 @@ def main [] {
     let packages = [
         $"($prefix)=($version)"
         $"($prefix)-fpm=($version)"
+        $"($prefix)-opcache=($version)"
         $"($prefix)-session=($version)"
     ]
     bf pkg install $packages
