v7.5.2 (#240)

bfren · web-flow · commit 1974292064e8 · 2025-10-17T11:39:35.000+01:00
Minor updates
* Updating to PHP 8.3.26 and 8.4.13
* Return nothing from init scripts to avoid empty list output during startup
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.5 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.6 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.6 AS final
+FROM ghcr.io/bfren/nginx:nginx1.20-alpine3.15-6.5.7 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.5 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.6 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.6 AS final
+FROM ghcr.io/bfren/nginx:nginx1.22-alpine3.16-6.5.7 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.5 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.6 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.6 AS final
+FROM ghcr.io/bfren/nginx:nginx1.24-alpine3.19-6.5.7 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.5 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.6 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.6 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 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.5 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.6 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.6 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 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.24-r0
+8.3.26-r0
diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.3.24
+8.3.26
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.5 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.4.6 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.6 AS final
+FROM ghcr.io/bfren/nginx:nginx1.28-alpine3.22-6.5.7 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.11-r0
+8.4.13-r0
diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.4.11
+8.4.13
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.5.1
+7.5.2
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.6"
-PHP_BRANCH="v2.4.5"
+BASE_VERSION="6.5.7"
+PHP_BRANCH="v2.4.6"
 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/22-php-ini.nu b/overlay/etc/bf/init.d/22-php-ini.nu
@@ -10,4 +10,7 @@ export def main [] {
         let override_values = bf fs read $x | from json
         bf-php ini $override_values
     } }
+
+    # return nothing
+    return
 }
diff --git a/overlay/etc/bf/init.d/23-www-conf.nu b/overlay/etc/bf/init.d/23-www-conf.nu
@@ -15,4 +15,7 @@ export def main [] {
         let override_values = bf fs read $x | from json
         bf-php ini insert_or_replace_values_in_file $fpm_conf $override_values
     } }
+
+    # return nothing
+    return
 }
