v7.4.4 (#236)

bfren · web-flow · commit ed093df6195c · 2025-08-20T10:28:40.000+01:00
Minor updates
* Using latest base images
* Updating to PHP 8.3.24 and 8.4.11
* Switching --ignore-errors to --optional for get
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.3 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.4 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.4 AS final
+FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.5 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.3 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.4 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.4 AS final
+FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.5 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.3 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.4 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.4 AS final
+FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.5 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.3 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.4 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.4 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 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.3 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.4 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.4 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.3.23-r0
+8.3.24-r0
diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.3.23
+8.3.24
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.3 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.4 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.4 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.5 AS final
 COPY --from=php /overlay /
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.4.10-r0
+8.4.11-r0
diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.4.10
+8.4.11
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.4.3
+7.4.4
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.4"
-PHP_BRANCH="v2.4.3"
+BASE_VERSION="6.5.5"
+PHP_BRANCH="v2.4.4"
 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/nu/scripts/bf-nginx-php/sessions.nu b/overlay/etc/nu/scripts/bf-nginx-php/sessions.nu
@@ -8,7 +8,7 @@ export def clean [] {
     # 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 --ignore-errors "session.gc_maxlifetime")
+        true => ($ini_override | open | get --optional "session.gc_maxlifetime")
         false => 86400
     }
 
