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 4c7a509..56a8456 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -20,7 +20,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 @@ -50,12 +50,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 @@ -87,8 +87,8 @@ jobs: tags: | bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-dev bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}-dev - ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-dev - ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}-dev + quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-dev + quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }}-dev - name: Build and push default id: docker_build_default @@ -105,8 +105,8 @@ jobs: tags: | bfren/apache:dev bfren/apache:${{ steps.version.outputs.contents }}-dev - ghcr.io/bfren/apache:dev - ghcr.io/bfren/apache:${{ steps.version.outputs.contents }}-dev + quay.io/bfren/apache:dev + quay.io/bfren/apache:${{ 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 0aca412..63a88ef 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 @@ -81,10 +81,10 @@ jobs: bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_major.outputs.contents }} bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_minor.outputs.contents }} bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }} - ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_major.outputs.contents }} - ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_minor.outputs.contents }} - ghcr.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }} + quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }} + quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_major.outputs.contents }} + quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version_minor.outputs.contents }} + quay.io/bfren/apache:apache${{ steps.apache_revision.outputs.contents }}-alpine${{ matrix.alpine }}-${{ steps.version.outputs.contents }} - name: Build and push default id: docker_build_default @@ -104,10 +104,10 @@ jobs: bfren/apache:${{ steps.version_major.outputs.contents }} bfren/apache:${{ steps.version_minor.outputs.contents }} bfren/apache:${{ steps.version.outputs.contents }} - ghcr.io/bfren/apache:latest - ghcr.io/bfren/apache:${{ steps.version_major.outputs.contents }} - ghcr.io/bfren/apache:${{ steps.version_minor.outputs.contents }} - ghcr.io/bfren/apache:${{ steps.version.outputs.contents }} + quay.io/bfren/apache:latest + quay.io/bfren/apache:${{ steps.version_major.outputs.contents }} + quay.io/bfren/apache:${{ steps.version_minor.outputs.contents }} + quay.io/bfren/apache:${{ 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/Dockerfile.esh b/Dockerfile.esh index fc09e27..98f3135 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> +FROM quay.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/VERSION b/VERSION index 1be571a..28cbf7c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.10 \ No newline at end of file +5.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index bf0d87a..7813681 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 89f71c7..6e63660 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -4.3 \ No newline at end of file +5.0 \ No newline at end of file diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 8f42f08..d233332 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index 1d28c85..b2022e9 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 6398391..cf21589 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index c8c6f55..19ae937 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 8c88e46..29345fd 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index d7ed66d..a00785f 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 750a35a..bf4b609 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index 13735b6..bf0b6ce 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 24bc3de..c210bfb 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.6.7" +BASE_VERSION="6.0.0" echo "Base: ${BASE_VERSION}" ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22"