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 diff --git a/7.4/Dockerfile b/7.4/Dockerfile index ead1ca3..2706755 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-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 7264cb3..73ebb97 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-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 8e7d818..7f5484a 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-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 f05ef46..feebdd6 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-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 9b1a646..14eff2f 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-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 3cd5949..6da068e 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-3.0.1 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" diff --git a/VERSION b/VERSION index 48a6b50..56fea8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.7 \ 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 diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 47dce90..3f206a2 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.1" echo "Base: ${BASE_VERSION}" PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4" 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 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 \