From 76045d6815649a44ddbefd7d9fe3512c32168c6a Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:47:01 +0000 Subject: [PATCH 1/9] Bumping version to 8.0.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5210382a..608c4e71 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.1 \ No newline at end of file +8.0.2 \ No newline at end of file From 85e13c96e1a95eedf074175e74af71316324541b Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:47:27 +0000 Subject: [PATCH 2/9] Bumping version to 8.1.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 608c4e71..da156181 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.2 \ No newline at end of file +8.1.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index b293f64d..8d1eec65 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -8.0 \ No newline at end of file +8.1 \ No newline at end of file From cdeab0e82c96ef0557d6d582c70d3eb0840962f2 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:48:38 +0000 Subject: [PATCH 3/9] Adding PHP 8.5 --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 2 +- 8.5/Dockerfile | 42 +++++++++++++++++++++++++++++++++++ 8.5/NGINX_BASE | 1 + 8.5/PHP_PREFIX | 1 + 8.5/overlay/tmp/PHP_BUILD | 1 + 8.5/overlay/tmp/PHP_REVISION | 1 + run.sh | 2 +- test.sh | 2 +- 9 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 8.5/Dockerfile create mode 100644 8.5/NGINX_BASE create mode 100644 8.5/PHP_PREFIX create mode 100644 8.5/overlay/tmp/PHP_BUILD create mode 100644 8.5/overlay/tmp/PHP_REVISION diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 06643d2c..c541219f 100644 --- a/.github/workflows/dev.yml +++ b/.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: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f47064cb..8049beda 100644 --- a/.github/workflows/publish.yml +++ b/.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: - diff --git a/8.5/Dockerfile b/8.5/Dockerfile new file mode 100644 index 00000000..b32d1252 --- /dev/null +++ b/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 diff --git a/8.5/NGINX_BASE b/8.5/NGINX_BASE new file mode 100644 index 00000000..feb3aeb3 --- /dev/null +++ b/8.5/NGINX_BASE @@ -0,0 +1 @@ +nginx1.28-alpine3.23 \ No newline at end of file diff --git a/8.5/PHP_PREFIX b/8.5/PHP_PREFIX new file mode 100644 index 00000000..aeeb556d --- /dev/null +++ b/8.5/PHP_PREFIX @@ -0,0 +1 @@ +php84 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_BUILD b/8.5/overlay/tmp/PHP_BUILD new file mode 100644 index 00000000..577cf8d5 --- /dev/null +++ b/8.5/overlay/tmp/PHP_BUILD @@ -0,0 +1 @@ +8.4.14-r0 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_REVISION b/8.5/overlay/tmp/PHP_REVISION new file mode 100644 index 00000000..478188d8 --- /dev/null +++ b/8.5/overlay/tmp/PHP_REVISION @@ -0,0 +1 @@ +8.4.14 \ No newline at end of file diff --git a/run.sh b/run.sh index a29ad468..266af10d 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ #!/bin/sh IMAGE=`cat VERSION` -PHP=${1:-8.4} +PHP=${1:-8.5} docker buildx build \ --load \ diff --git a/test.sh b/test.sh index c547aeb5..88d85c88 100644 --- a/test.sh +++ b/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 \ From d3fa9063ff1c0b659621ab74485de2d7e67196e1 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:49:05 +0000 Subject: [PATCH 4/9] Switching to use Alpine 3.23 --- 8.3/NGINX_BASE | 2 +- 8.4/NGINX_BASE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/8.3/NGINX_BASE b/8.3/NGINX_BASE index f778270c..feb3aeb3 100644 --- a/8.3/NGINX_BASE +++ b/8.3/NGINX_BASE @@ -1 +1 @@ -nginx1.28-alpine3.22 \ No newline at end of file +nginx1.28-alpine3.23 \ No newline at end of file diff --git a/8.4/NGINX_BASE b/8.4/NGINX_BASE index f778270c..feb3aeb3 100644 --- a/8.4/NGINX_BASE +++ b/8.4/NGINX_BASE @@ -1 +1 @@ -nginx1.28-alpine3.22 \ No newline at end of file +nginx1.28-alpine3.23 \ No newline at end of file From b753ed5d7a49be9a436ea9fd7d3f2d2422abe1a2 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:49:16 +0000 Subject: [PATCH 5/9] Using latest base images --- 7.4/Dockerfile | 4 ++-- 8.0/Dockerfile | 4 ++-- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 4 ++-- 8.4/Dockerfile | 4 ++-- 8.5/Dockerfile | 6 +++--- generate-dockerfiles.sh | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 1d34170d..49e9b70a 100644 --- 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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.20-alpine3.15-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.20-alpine3.15-7.1.0 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 index 035422d6..ce10ef84 100644 --- 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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.22-alpine3.16-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.22-alpine3.16-7.1.0 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 index 5273a10d..99028296 100644 --- 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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.24-alpine3.19-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.24-alpine3.19-7.1.0 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 index a7d49463..59ffb978 100644 --- 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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.22-7.1.0 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 index 96e9d8fa..1da336d2 100644 --- 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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index b32d1252..b7c41bc6 100644 --- 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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" diff --git a/8.5/Dockerfile b/8.5/Dockerfile index b32d1252..a396a734 100644 --- a/8.5/Dockerfile +++ b/8.5/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 v3.0.1 https://github.com/bfren/docker-php.git && \ + apk add git && git clone --branch v3.1.0 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 quay.io/bfren/nginx:nginx1.28-alpine3.22-7.0.1 AS final +FROM quay.io/bfren/nginx:nginx1.28-alpine3.23-7.1.0 AS final COPY --from=php /overlay / LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-php" @@ -27,7 +27,7 @@ ARG BF_PUBLISHING ARG BF_VERSION COPY ./overlay / -COPY ./8.4/overlay / +COPY ./8.5/overlay / ENV \ # PHP config directory diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index b48f4df1..300e353c 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,9 +4,9 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="7.0.1" -PHP_BRANCH="v3.0.1" -PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" +BASE_VERSION="7.1.0" +PHP_BRANCH="v3.1.0" +PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do From 9ec0c965e2a7cc85091990eddf31f432c5e31662 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:49:40 +0000 Subject: [PATCH 6/9] Adding PHP 8.4 and 8.5 to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37786c3e..e896f610 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [Docker Repository](https://hub.docker.com/r/bfren/nginx-php) - [bfren ecosystem](https://github.com/bfren/docker) -Nginx plus PHP (7.4, 8.0, 8.1, 8.2 and 8.3) - no SSL support etc, designed to be used behind a proxy server. Minimal PHP packages are installed: +Nginx plus PHP (7.4, 8.0, 8.1, 8.2, 8.3, 8.4 and 8.5) - no SSL support etc, designed to be used behind a proxy server. Minimal PHP packages are installed: * `php` * `php-common` From fe4c697f4a3e4f42eaeab4b878716745b72ec068 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:50:16 +0000 Subject: [PATCH 7/9] Adding correct version to PHP 8.5 image --- 8.5/Dockerfile | 4 ++-- 8.5/PHP_PREFIX | 2 +- 8.5/overlay/tmp/PHP_BUILD | 2 +- 8.5/overlay/tmp/PHP_REVISION | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/8.5/Dockerfile b/8.5/Dockerfile index a396a734..6119a0e8 100644 --- a/8.5/Dockerfile +++ b/8.5/Dockerfile @@ -31,12 +31,12 @@ COPY ./8.5/overlay / ENV \ # PHP config directory - BF_PHP_DIR="/etc/php84" \ + BF_PHP_DIR="/etc/php85" \ # 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" + BF_PHP_PREFIX="php85" RUN bf-install diff --git a/8.5/PHP_PREFIX b/8.5/PHP_PREFIX index aeeb556d..e0d78da1 100644 --- a/8.5/PHP_PREFIX +++ b/8.5/PHP_PREFIX @@ -1 +1 @@ -php84 \ No newline at end of file +php85 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_BUILD b/8.5/overlay/tmp/PHP_BUILD index 577cf8d5..c788c7b5 100644 --- a/8.5/overlay/tmp/PHP_BUILD +++ b/8.5/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.14-r0 \ No newline at end of file +8.5.0-r0 \ No newline at end of file diff --git a/8.5/overlay/tmp/PHP_REVISION b/8.5/overlay/tmp/PHP_REVISION index 478188d8..5eaed3b7 100644 --- a/8.5/overlay/tmp/PHP_REVISION +++ b/8.5/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.14 \ No newline at end of file +8.5.0 \ No newline at end of file From 60448a6d2a66be009b7d5751f62d7645f73dd138 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 20:07:11 +0000 Subject: [PATCH 8/9] Updating to PHP 8.3.28 and 8.4.15 --- 8.3/overlay/tmp/PHP_BUILD | 2 +- 8.3/overlay/tmp/PHP_REVISION | 2 +- 8.4/overlay/tmp/PHP_BUILD | 2 +- 8.4/overlay/tmp/PHP_REVISION | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.3/overlay/tmp/PHP_BUILD b/8.3/overlay/tmp/PHP_BUILD index 598559f9..9739da83 100644 --- a/8.3/overlay/tmp/PHP_BUILD +++ b/8.3/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.3.27-r0 \ No newline at end of file +8.3.28-r0 \ No newline at end of file diff --git a/8.3/overlay/tmp/PHP_REVISION b/8.3/overlay/tmp/PHP_REVISION index eb433794..6b28411d 100644 --- a/8.3/overlay/tmp/PHP_REVISION +++ b/8.3/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.3.27 \ No newline at end of file +8.3.28 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_BUILD b/8.4/overlay/tmp/PHP_BUILD index 577cf8d5..493449e9 100644 --- a/8.4/overlay/tmp/PHP_BUILD +++ b/8.4/overlay/tmp/PHP_BUILD @@ -1 +1 @@ -8.4.14-r0 \ No newline at end of file +8.4.15-r0 \ No newline at end of file diff --git a/8.4/overlay/tmp/PHP_REVISION b/8.4/overlay/tmp/PHP_REVISION index 478188d8..79745a8e 100644 --- a/8.4/overlay/tmp/PHP_REVISION +++ b/8.4/overlay/tmp/PHP_REVISION @@ -1 +1 @@ -8.4.14 \ No newline at end of file +8.4.15 \ No newline at end of file From 5af8e51765a9b23639df008ce903924f12c92ef9 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 20:11:09 +0000 Subject: [PATCH 9/9] Do not install php-opcache on PHP >= 8.5 --- overlay/tmp/install | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/overlay/tmp/install b/overlay/tmp/install index d4deafa9..677b1794 100644 --- a/overlay/tmp/install +++ b/overlay/tmp/install @@ -13,11 +13,15 @@ def main [] { let packages = [ $"($prefix)=($version)" $"($prefix)-fpm=($version)" - $"($prefix)-opcache=($version)" $"($prefix)-session=($version)" ] bf pkg install $packages + # opcache is part of PHP >= 8.5 + if not ($version | bf version is_at_least "8.5.0") { + bf pkg install [$"($prefix)-opcache=($version)"] + } + # create symlinks so PHP can be called on the commandline using php and php-fpm let php = "/usr/bin/php" let fpm = "/usr/sbin/php-fpm"