From 3309df7d3a80ca0302aa1af3b9a84b93a87a73f6 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 08:32:13 +0000 Subject: [PATCH 1/5] Bumping version to 8.1.6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index daf8e4cb..dd9a10b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.5 \ No newline at end of file +8.1.6 \ No newline at end of file From 687faac569c3c7cb103bd818fa2cda0a5606c87e Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 08:32:31 +0000 Subject: [PATCH 2/5] Adding ini get_override_values function --- overlay/etc/nu/scripts/bf-nginx-php/ini.nu | 25 ++++++++++++++++++++++ overlay/etc/nu/scripts/bf-nginx-php/mod.nu | 1 + 2 files changed, 26 insertions(+) create mode 100644 overlay/etc/nu/scripts/bf-nginx-php/ini.nu diff --git a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu new file mode 100644 index 00000000..7ec3663b --- /dev/null +++ b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu @@ -0,0 +1,25 @@ +use bf + +# Get php.ini override values +export def get_override_values []: nothing -> record { + # get variables + let ini_override = bf env PHP_INI_OVERRIDE_D + + # if the override path does not exist return nothing + if not ($ini_override | path exists) { + return + } + + # load override json files, + # sorted alphabetically + # read as json + # reduce array so later values override earlier values + return $"($ini_override)/*.json" + | into glob + | ls --full-paths $in + | get name + | sort --natural + | each {|x| bf fs read $x | from json } + | reduce {|it, acc| $acc | merge $it } + | into record +} diff --git a/overlay/etc/nu/scripts/bf-nginx-php/mod.nu b/overlay/etc/nu/scripts/bf-nginx-php/mod.nu index 1113be2a..c317f45f 100644 --- a/overlay/etc/nu/scripts/bf-nginx-php/mod.nu +++ b/overlay/etc/nu/scripts/bf-nginx-php/mod.nu @@ -1,3 +1,4 @@ export module conf.nu +export module ini.nu export module run.nu export module sessions.nu From 2bba4d0b6496767e9ddd2965b32dfcb17ac8cd09 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 08:32:45 +0000 Subject: [PATCH 3/5] Using ini get_override_values --- overlay/etc/bf/init.d/22-php-ini.nu | 12 ++++++------ overlay/etc/nu/scripts/bf-nginx-php/sessions.nu | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/overlay/etc/bf/init.d/22-php-ini.nu b/overlay/etc/bf/init.d/22-php-ini.nu index a52f7e23..daccdca9 100644 --- a/overlay/etc/bf/init.d/22-php-ini.nu +++ b/overlay/etc/bf/init.d/22-php-ini.nu @@ -1,15 +1,15 @@ use bf +use bf-nginx-php use bf-php bf env load # Apply any overrides to php.ini export def main [] { - # 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 - } } + # get ini override values + let override_values = bf-nginx-php ini get_override_values + + # download specified php.ini file and apply any override values + bf-php ini $override_values # return nothing return diff --git a/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu b/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu index 60b5c08b..a2c608fd 100644 --- a/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu +++ b/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu @@ -1,4 +1,5 @@ use bf +use ini.nu # Clean sessions as user www export def clean [] { @@ -6,11 +7,8 @@ export def clean [] { bf env load # get session max lifetime (if set) - let ini_override = bf env PHP_INI_OVERRIDE - let max_lifetime = match ($ini_override | path exists) { - true => ($ini_override | open | get --optional "session.gc_maxlifetime") - false => 86400 - } + let ini_override = bf env PHP_INI_OVERRIDE_D + let max_lifetime = ini get_override_values | default 86400 session.gc_maxlifetime # hat-tip https://www.getpagespeed.com/server-setup/php/cleanup-php-sessions-like-a-pro let args = [ From 6bd8dad011494731b9b87851ee72e5a7e6bfd19e Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 08:33:15 +0000 Subject: [PATCH 4/5] Using latest base images --- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 8.4/Dockerfile | 2 +- 8.5/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 2609f05e..5ddf9ee6 100644 --- 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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 05b6dd53..13d8850f 100644 --- 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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index bd8f55bb..b4a87631 100644 --- 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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 3cbf9bce..206e343f 100644 --- 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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 860e33bd..0a2a4d71 100644 --- 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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 8f20215b..2b7ea69c 100644 --- 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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/8.5/Dockerfile b/8.5/Dockerfile index 3910246d..cc8bf1f6 100644 --- a/8.5/Dockerfile +++ b/8.5/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 v3.1.5 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.6 https://github.com/bfren/docker-php.git && \ mkdir /overlay && \ mv docker-php/overlay/etc /overlay/ diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 88289f70..e330c022 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -5,7 +5,7 @@ set -euo pipefail docker pull bfren/alpine BASE_VERSION="7.1.4" -PHP_BRANCH="v3.1.5" +PHP_BRANCH="v3.1.6" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do From 3309b627139b8667eb3aa8c1142b1988f3106021 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 08:33:42 +0000 Subject: [PATCH 5/5] Updating to PHP 8.4.18 and 8.5.3 --- 8.4/overlay/tmp/PHP_BUILD | 2 +- 8.4/overlay/tmp/PHP_REVISION | 2 +- 8.5/overlay/tmp/PHP_BUILD | 2 +- 8.5/overlay/tmp/PHP_REVISION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD index 08432178..4cfef99a 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.17-r0 \ No newline at end of file +8.4.18-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index d7b295fc..0b95416f 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.17 \ No newline at end of file +8.4.18 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_BUILD b/8.5/overlay/tmp/PHP_BUILD index 454c0949..052c3ca5 100644 --- a/8.5/overlay/tmp/PHP_BUILD +++ b/8.5/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.5.2-r0 \ No newline at end of file +8.5.3-r0 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_REVISION b/8.5/overlay/tmp/PHP_REVISION index bd0b85a9..6a295953 100644 --- a/8.5/overlay/tmp/PHP_REVISION +++ b/8.5/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.5.2 \ No newline at end of file +8.5.3 \ No newline at end of file