From 2f3e492446e960c7d2e2e40425fe2abba93b0498 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 07:40:49 +0000 Subject: [PATCH 1/7] Bumping version to 2.4.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 48a6b50..752a79e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.7 \ No newline at end of file +2.4.8 \ No newline at end of file From 12a2928710edbf94361089be3c7a14806da57308 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 07:41:17 +0000 Subject: [PATCH 2/7] Bumping version to 3.0.0 --- VERSION | 2 +- VERSION_MAJOR | 2 +- VERSION_MINOR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 752a79e..56fea8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.8 \ No newline at end of file +3.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index d8263ee..e440e5c 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 7208c21..f398a20 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -2.4 \ No newline at end of file +3.0 \ No newline at end of file From 6fde9048a4ddaef6d77bea1f381ae2f4d7b67eab Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 07:41:25 +0000 Subject: [PATCH 3/7] Updating workflow action versions --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 18 +++++++++--------- .github/workflows/publish.yml | 28 ++++++++++++++-------------- .github/workflows/update-readme.yml | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 54c3776..0d434ac 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index eb44c3c..8c300b2 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 build: strategy: fail-fast: false @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -49,12 +49,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry + name: Login to Quay.io Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: quay.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.QUAY_TOKEN }} - name: Build and export id: docker_export @@ -86,8 +86,8 @@ jobs: tags: | bfren/php:php${{ matrix.php }}-dev bfren/php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev - ghcr.io/bfren/php:php${{ matrix.php }}-dev - ghcr.io/bfren/php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev + quay.io/bfren/php:php${{ matrix.php }}-dev + quay.io/bfren/php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev - name: Build and push default tags id: docker_build_default @@ -103,8 +103,8 @@ jobs: tags: | bfren/php:dev bfren/php:${{ steps.version.outputs.contents }}-dev - ghcr.io/bfren/php:dev - ghcr.io/bfren/php:${{ steps.version.outputs.contents }}-dev + quay.io/bfren/php:dev + quay.io/bfren/php:${{ steps.version.outputs.contents }}-dev - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 373e6a3..3c14b77 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -57,12 +57,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry + name: Login to Quay.io Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: quay.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.QUAY_TOKEN }} - name: Build and push id: docker_build @@ -83,12 +83,12 @@ jobs: bfren/php:php${{ matrix.php }}-${{ steps.version.outputs.contents }} bfren/php:php${{ steps.php_revision.outputs.contents }} bfren/php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/php:php${{ matrix.php }} - ghcr.io/bfren/php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }} - ghcr.io/bfren/php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }} - ghcr.io/bfren/php:php${{ matrix.php }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/php:php${{ steps.php_revision.outputs.contents }} - ghcr.io/bfren/php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }} + quay.io/bfren/php:php${{ matrix.php }} + quay.io/bfren/php:php${{ matrix.php }}-${{ steps.version_major.outputs.contents }} + quay.io/bfren/php:php${{ matrix.php }}-${{ steps.version_minor.outputs.contents }} + quay.io/bfren/php:php${{ matrix.php }}-${{ steps.version.outputs.contents }} + quay.io/bfren/php:php${{ steps.php_revision.outputs.contents }} + quay.io/bfren/php:php${{ steps.php_revision.outputs.contents }}-${{ steps.version.outputs.contents }} - name: Build and push default tags id: docker_build_default @@ -108,10 +108,10 @@ jobs: bfren/php:${{ steps.version_major.outputs.contents }} bfren/php:${{ steps.version_minor.outputs.contents }} bfren/php:${{ steps.version.outputs.contents }} - ghcr.io/bfren/php:latest - ghcr.io/bfren/php:${{ steps.version_major.outputs.contents }} - ghcr.io/bfren/php:${{ steps.version_minor.outputs.contents }} - ghcr.io/bfren/php:${{ steps.version.outputs.contents }} + quay.io/bfren/php:latest + quay.io/bfren/php:${{ steps.version_major.outputs.contents }} + quay.io/bfren/php:${{ steps.version_minor.outputs.contents }} + quay.io/bfren/php:${{ steps.version.outputs.contents }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7fc7506..4e5b4a9 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,7 +15,7 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Login to DockerHub uses: docker/login-action@v3 From 19c82b91aa684d2bfd7148a66bc78278a71107c7 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 07:41:35 +0000 Subject: [PATCH 4/7] Switching to quay.io --- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 8.1/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 8.4/Dockerfile | 2 +- Dockerfile.esh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index ead1ca3..c3d7408 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine3.15-2.9.9 +FROM quay.io/bfren/alpine:alpine3.15-2.9.9 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 7264cb3..3854703 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine3.16-2.9.9 +FROM quay.io/bfren/alpine:alpine3.16-2.9.9 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 8e7d818..b602a1a 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine3.19-2.9.9 +FROM quay.io/bfren/alpine:alpine3.19-2.9.9 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index f05ef46..7726bb4 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine3.22-2.9.9 +FROM quay.io/bfren/alpine:alpine3.22-2.9.9 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 9b1a646..fb4836e 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine3.22-2.9.9 +FROM quay.io/bfren/alpine:alpine3.22-2.9.9 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 3cd5949..1f9f62b 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine3.22-2.9.9 +FROM quay.io/bfren/alpine:alpine3.22-2.9.9 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/Dockerfile.esh b/Dockerfile.esh index 4661a5e..d6b510a 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> +FROM quay.io/bfren/alpine:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" From cf44a8575376b90ae8c8e8a45bf9e60bc81c597a Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 07:41:43 +0000 Subject: [PATCH 5/7] Using bf http download --- overlay/etc/nu/scripts/bf-php/ini.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/nu/scripts/bf-php/ini.nu b/overlay/etc/nu/scripts/bf-php/ini.nu index 9bf6f7e..86a046b 100644 --- a/overlay/etc/nu/scripts/bf-php/ini.nu +++ b/overlay/etc/nu/scripts/bf-php/ini.nu @@ -30,7 +30,7 @@ def download [ # download file let url = $"https://raw.githubusercontent.com/php/php-src/master/php.ini-($environment)" bf write debug $"Downloading php.ini from ($url)." ini/download - http get --raw $url | save --force $file + bf http download $url $file # mark as downloaded $environment | save --force $downloaded From fdb9b30bda15a32daddbd52950edfc21aae49ddd Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 07:42:02 +0000 Subject: [PATCH 6/7] 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 +- generate-dockerfiles.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index c3d7408..a524f40 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.15-2.9.9 +FROM quay.io/bfren/alpine:alpine3.15-3.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 3854703..2bd79b0 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.16-2.9.9 +FROM quay.io/bfren/alpine:alpine3.16-3.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.1/Dockerfile b/8.1/Dockerfile index b602a1a..0762cf8 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.19-2.9.9 +FROM quay.io/bfren/alpine:alpine3.19-3.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 7726bb4..cc1a7d2 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-2.9.9 +FROM quay.io/bfren/alpine:alpine3.22-3.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index fb4836e..1136e02 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-2.9.9 +FROM quay.io/bfren/alpine:alpine3.22-3.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 1f9f62b..24fe71f 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-2.9.9 +FROM quay.io/bfren/alpine:alpine3.22-3.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 47dce90..315b826 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="2.9.9" +BASE_VERSION="3.0.0" echo "Base: ${BASE_VERSION}" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" From 53f3f8becdef7a57f93f4af344c46a834e2a1cf5 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 23 Nov 2025 13:57:39 +0000 Subject: [PATCH 7/7] 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 +- generate-dockerfiles.sh | 2 +- run.sh | 1 - 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/7.4/Dockerfile b/7.4/Dockerfile index a524f40..2706755 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.15-3.0.0 +FROM quay.io/bfren/alpine:alpine3.15-3.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 2bd79b0..73ebb97 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.16-3.0.0 +FROM quay.io/bfren/alpine:alpine3.16-3.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 0762cf8..7f5484a 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.19-3.0.0 +FROM quay.io/bfren/alpine:alpine3.19-3.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index cc1a7d2..feebdd6 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.0 +FROM quay.io/bfren/alpine:alpine3.22-3.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 1136e02..14eff2f 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.0 +FROM quay.io/bfren/alpine:alpine3.22-3.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 24fe71f..6da068e 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine:alpine3.22-3.0.0 +FROM quay.io/bfren/alpine:alpine3.22-3.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-php" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 315b826..3f206a2 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="3.0.0" +BASE_VERSION="3.0.1" echo "Base: ${BASE_VERSION}" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" diff --git a/run.sh b/run.sh index ff75ec5..801bb2e 100755 --- a/run.sh +++ b/run.sh @@ -5,7 +5,6 @@ PHP=${1:-8.4} docker buildx build \ --load \ - --progress plain \ --build-arg BF_IMAGE=php \ --build-arg BF_VERSION=${IMAGE} \ -f ${PHP}/Dockerfile \