Adding PHP 8.5

Author: bfren

.github/workflows/dev.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]
     runs-on: ubuntu-latest
     steps:
       -

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
+        php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5" ]
     runs-on: ubuntu-latest
     steps:
       -

8.5/Dockerfile

@@ -0,0 +1,42 @@
+#======================================================================================================================
+# STAGE 0: get Nu scripts from the PHP image overlay
+#======================================================================================================================
+
+FROM quay.io/bfren/alpine AS php
+
+WORKDIR /tmp
+RUN \
+    # get the Nu scripts from the PHP image overlay
+    echo "Cloning Alpine overlay." && \
+    apk add git && git clone --branch v3.0.1 https://github.com/bfren/docker-php.git && \
+    mkdir /overlay && \
+    mv docker-php/overlay/etc /overlay/
+
+
+#======================================================================================================================
+# STAGE 1: create final image
+#======================================================================================================================
+
+FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final
+COPY --from=php /overlay /
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php"
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+COPY ./overlay /
+COPY ./8.4/overlay /
+
+ENV \
+    # PHP config directory
+    BF_PHP_DIR="/etc/php84" \
+    # offical php.ini template to download
+    BF_PHP_ENV="production" \
+    # space-separated extensions to install on startup
+    BF_PHP_EXT= \
+    # PHP package prefix
+    BF_PHP_PREFIX="php84"
+
+RUN bf-install

8.5/NGINX_BASE

@@ -0,0 +1 @@
+nginx1.28-alpine3.23

8.5/PHP_PREFIX

@@ -0,0 +1 @@
+php84

8.5/overlay/tmp/PHP_BUILD

@@ -0,0 +1 @@
+8.4.14-r0

8.5/overlay/tmp/PHP_REVISION

@@ -0,0 +1 @@
+8.4.14

run.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-PHP=${1:-8.4}
+PHP=${1:-8.5}
 
 docker buildx build \
     --load \

test.sh

@@ -2,7 +2,7 @@
 
 IMAGE=nginx-php
 VERSION=`cat VERSION`
-PHP=${1:-8.4}
+PHP=${1:-8.5}
 TAG=${IMAGE}-test
 
 docker buildx build \