From 8cef1f37504761a8e0da32043a6b7bcc55611974 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:20:08 +0000 Subject: [PATCH 1/8] Bumping version to 3.0.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 13d683c..d9c62ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.1 \ No newline at end of file +3.0.2 \ No newline at end of file From ff9237b19179daf393264871e6e7456f776f2c31 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:21:50 +0000 Subject: [PATCH 2/8] Bumping version to 3.1.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d9c62ed..a0cd9f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.2 \ No newline at end of file +3.1.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index f398a20..06a4457 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -3.0 \ No newline at end of file +3.1 \ No newline at end of file From 30dfe2cbd4174804178bcda8d5c54f0ea7bf7f24 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:22:33 +0000 Subject: [PATCH 3/8] Adding PHP 8.5 --- .github/workflows/dev.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- 8.5/ALPINE_MINOR | 1 + 8.5/Dockerfile | 26 ++++++++++++++++++++++++++ 8.5/PHP_PREFIX | 1 + 8.5/overlay/tmp/PHP_BUILD | 1 + 8.5/overlay/tmp/PHP_REVISION | 1 + generate-dockerfiles.sh | 2 +- 8 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 8.5/ALPINE_MINOR create mode 100644 8.5/Dockerfile 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 8c300b2..bfdd4f0 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -20,7 +20,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: - @@ -91,7 +91,7 @@ jobs: - name: Build and push default tags id: docker_build_default - if: matrix.php == '8.4' + if: matrix.php == '8.5' uses: docker/build-push-action@v6 with: file: ./${{ matrix.php }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3c14b77..18e8149 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: - @@ -92,7 +92,7 @@ jobs: - name: Build and push default tags id: docker_build_default - if: matrix.php == '8.4' + if: matrix.php == '8.5' uses: docker/build-push-action@v6 with: context: . diff --git a/8.5/ALPINE_MINOR b/8.5/ALPINE_MINOR new file mode 100644 index 0000000..2ef9c66 --- /dev/null +++ b/8.5/ALPINE_MINOR @@ -0,0 +1 @@ +3.23 \ No newline at end of file diff --git a/8.5/Dockerfile b/8.5/Dockerfile new file mode 100644 index 0000000..9e89625 --- /dev/null +++ b/8.5/Dockerfile @@ -0,0 +1,26 @@ +FROM quay.io/bfren/alpine:alpine3.22-3.0.2 + +LABEL org.opencontainers.image.source="https://github.com/bfren/docker-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 + BF_PHP_EXT= \ + # PHP package prefix + BF_PHP_PREFIX="php84" + +RUN bf-install + +VOLUME [ "/ws" ] + +ENTRYPOINT [ "/init" ] diff --git a/8.5/PHP_PREFIX b/8.5/PHP_PREFIX new file mode 100644 index 0000000..e0d78da --- /dev/null +++ b/8.5/PHP_PREFIX @@ -0,0 +1 @@ +php85 \ 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 0000000..c788c7b --- /dev/null +++ b/8.5/overlay/tmp/PHP_BUILD @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..5eaed3b --- /dev/null +++ b/8.5/overlay/tmp/PHP_REVISION @@ -0,0 +1 @@ +8.5.0 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 9f636fa..f4338bb 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BASE_VERSION="3.0.2" echo "Base: ${BASE_VERSION}" -PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" +PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" for V in ${PHP_VERSIONS} ; do echo "PHP ${V}" From accf6d18f686843458cb26767b1d785f1bb55d80 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:22:46 +0000 Subject: [PATCH 4/8] Switching to Alpine 3.23 --- 8.3/ALPINE_MINOR | 2 +- 8.4/ALPINE_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/8.3/ALPINE_MINOR b/8.3/ALPINE_MINOR index 93a84c3..2ef9c66 100644 --- a/8.3/ALPINE_MINOR +++ b/8.3/ALPINE_MINOR @@ -1 +1 @@ -3.22 \ No newline at end of file +3.23 \ No newline at end of file diff --git a/8.4/ALPINE_MINOR b/8.4/ALPINE_MINOR index 93a84c3..2ef9c66 100644 --- a/8.4/ALPINE_MINOR +++ b/8.4/ALPINE_MINOR @@ -1 +1 @@ -3.22 \ No newline at end of file +3.23 \ No newline at end of file From 00f283ca215d2292b50d44a03f49c521d1ddb951 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:22:58 +0000 Subject: [PATCH 5/8] 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 598559f..9739da8 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 eb43379..6b28411 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 577cf8d..493449e 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 478188d..79745a8 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 1ec05cd72b0d78c43142b63affd2c74993557b2c Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:23:24 +0000 Subject: [PATCH 6/8] Using latest base images --- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 8.4/Dockerfile | 2 +- 8.5/Dockerfile | 8 ++++---- generate-dockerfiles.sh | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 5e36441..5ec20cc 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.15-3.0.2 +FROM quay.io/bfren/alpine:alpine3.15-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 7fa9e5a..11e9199 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.16-3.0.2 +FROM quay.io/bfren/alpine:alpine3.16-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 94d5618..06d3b9e 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.19-3.0.2 +FROM quay.io/bfren/alpine:alpine3.19-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 5af5e10..192775b 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.2 +FROM quay.io/bfren/alpine:alpine3.22-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index ce9b17c..c170b97 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.2 +FROM quay.io/bfren/alpine:alpine3.23-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 9e89625..11520c8 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.2 +FROM quay.io/bfren/alpine:alpine3.23-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.5/Dockerfile b/8.5/Dockerfile index 9e89625..7ad9605 100644 --- a/8.5/Dockerfile +++ b/8.5/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.2 +FROM quay.io/bfren/alpine:alpine3.23-3.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" @@ -7,17 +7,17 @@ ARG BF_PUBLISHING ARG BF_VERSION COPY ./overlay / -COPY ./8.4/overlay / +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 BF_PHP_EXT= \ # PHP package prefix - BF_PHP_PREFIX="php84" + BF_PHP_PREFIX="php85" RUN bf-install diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index f4338bb..f5290ca 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="3.0.2" +BASE_VERSION="3.1.0" echo "Base: ${BASE_VERSION}" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5" From 550d61f285b19f3b415f63c1646fce873b3d5d39 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:24:18 +0000 Subject: [PATCH 7/8] Making PHP 8.5 the default --- run.sh | 2 +- test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 801bb2e..875fa30 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 b91a78a..483fdac 100644 --- a/test.sh +++ b/test.sh @@ -2,7 +2,7 @@ IMAGE=php VERSION=`cat VERSION` -PHP=${1:-8.4} +PHP=${1:-8.5} TAG=${IMAGE}-test docker buildx build \ From da4e82fbc3c7d62f679f9481e8115be85699e022 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:24:20 +0000 Subject: [PATCH 8/8] 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 9e5ce24..fd6c02e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [Docker Repository](https://hub.docker.com/r/bfren/php) - [bfren ecosystem](https://github.com/bfren/docker) -PHP (7.4, 8.0, 8.1, 8.2 and 8.3) CLI with no additional packages installed. +PHP (7.4, 8.0, 8.1, 8.2, 8.3, 8.4 and 8.5) CLI with no additional packages installed. To override values in php.ini map a `php-ini.json` file to root - see `php-ini-sample.json`.