v7.2.19 (#217)

bfren · web-flow · commit 33c2b50890ba · 2024-08-31T12:42:59.000+01:00
Minor updates
* Using latest PHP base images
* Capture php stdout in php-fpm
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.2.16 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.2.17 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
@@ -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.2.16 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.2.17 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
@@ -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.2.16 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.2.17 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
@@ -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.2.16 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.2.17 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
@@ -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.2.16 https://github.com/bfren/docker-php.git && \
+    apk add git && git clone --branch v2.2.17 https://github.com/bfren/docker-php.git && \
     mkdir /overlay && \
     mv docker-php/overlay/etc /overlay/
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.2.18
+7.2.19
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 docker pull bfren/alpine
 
 BASE_VERSION="6.3.9"
-PHP_BRANCH="v2.2.16"
+PHP_BRANCH="v2.2.17"
 PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3"
 
 for V in ${PHP_VERSIONS} ; do
diff --git a/overlay/www-conf.json b/overlay/www-conf.json
@@ -1,3 +1,5 @@
 {
-    "clear_env": "yes"
+    "catch_workers_output": "yes",
+    "clear_env": "yes",
+    "decorate_workers_output": "no"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`{`
`2`		`- "clear_env": "yes"`
	`2`	`+ "catch_workers_output": "yes",`
	`3`	`+ "clear_env": "yes",`
	`4`	`+ "decorate_workers_output": "no"`
`3`	`5`	`}`