v5.1.18 (#249)

Minor updates * Adding .empty overlay Build updates * Using specific PHP image versions
bfren · Jun 16, 2024 · 73f2183 · 73f2183
1 parent cd50f96
commit 73f2183
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
         name: Read PHP version - revision
         uses: bfren/read-file@v2
         with:
-          file: ./php${{ matrix.php }}/overlay/tmp/PHP_REVISION
+          file: ./php${{ matrix.php }}/overlay/PHP_REVISION
         id: php_revision
       -
         name: Read FreeScout minor version

diff --git a/Dockerfile.esh b/Dockerfile.esh
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php<%= ${PHP_MINOR} %>-<%= ${BASE_VERSION} %>
+FROM bfren/nginx-php:php<%= ${PHP_REVISION} %>-<%= ${BASE_VERSION} %>
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-freescout"
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.1.17
+5.1.18
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,21 +4,23 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="7.2.8"
+BASE_VERSION="7.2.9"
 echo "Base: ${BASE_VERSION}"
 
 PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3"
 for V in ${PHP_VERSIONS} ; do
 
     echo "FreeScout for PHP ${V}"
+    PHP_REVISION=`cat php${V}/PHP_REVISION`
 
     DOCKERFILE=$(docker run \
         -v ${PWD}:/ws \
         -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
         BASE_VERSION=${BASE_VERSION} \
-        PHP_MINOR=${V}
+        PHP_MINOR=${V} \
+        PHP_REVISION=${PHP_REVISION}
     )
 
     echo "${DOCKERFILE}" > ./php${V}/Dockerfile

diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php7.4-7.2.8
+FROM bfren/nginx-php:php7.4.33-7.2.9
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-freescout"
 

diff --git a/php7.4/overlay/tmp/PHP_REVISION → php7.4/PHP_REVISION b/php7.4/overlay/tmp/PHP_REVISION → php7.4/PHP_REVISION
diff --git a/php7.4/overlay/tmp/PHP_BUILD b/php7.4/overlay/tmp/PHP_BUILD
diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php8.0-7.2.8
+FROM bfren/nginx-php:php8.0.30-7.2.9
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-freescout"
 

diff --git a/php8.0/overlay/tmp/PHP_REVISION → php8.0/PHP_REVISION b/php8.0/overlay/tmp/PHP_REVISION → php8.0/PHP_REVISION
diff --git a/php8.0/overlay/.empty b/php8.0/overlay/.empty
diff --git a/php8.0/overlay/tmp/PHP_BUILD b/php8.0/overlay/tmp/PHP_BUILD
diff --git a/php8.1/Dockerfile b/php8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php8.1-7.2.8
+FROM bfren/nginx-php:php8.1.29-7.2.9
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-freescout"
 

diff --git a/php8.1/overlay/tmp/PHP_REVISION → php8.1/PHP_REVISION b/php8.1/overlay/tmp/PHP_REVISION → php8.1/PHP_REVISION
diff --git a/php8.1/overlay/.empty b/php8.1/overlay/.empty
diff --git a/php8.1/overlay/tmp/PHP_BUILD b/php8.1/overlay/tmp/PHP_BUILD
diff --git a/php8.2/Dockerfile b/php8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php8.2-7.2.8
+FROM bfren/nginx-php:php8.2.20-7.2.9
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-freescout"
 

diff --git a/php8.2/overlay/tmp/PHP_REVISION → php8.2/PHP_REVISION b/php8.2/overlay/tmp/PHP_REVISION → php8.2/PHP_REVISION
diff --git a/php8.2/overlay/.empty b/php8.2/overlay/.empty
diff --git a/php8.2/overlay/tmp/PHP_BUILD b/php8.2/overlay/tmp/PHP_BUILD
diff --git a/php8.3/Dockerfile b/php8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php8.3-7.2.8
+FROM bfren/nginx-php:php8.3.8-7.2.9
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-freescout"
 

diff --git a/php8.3/overlay/tmp/PHP_REVISION → php8.3/PHP_REVISION b/php8.3/overlay/tmp/PHP_REVISION → php8.3/PHP_REVISION
diff --git a/php8.3/overlay/.empty b/php8.3/overlay/.empty
diff --git a/php8.3/overlay/tmp/PHP_BUILD b/php8.3/overlay/tmp/PHP_BUILD