diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 0d434ac..61886a1 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@v6 + uses: actions/checkout@v7 - 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 2b833ff..741b6b7 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -39,19 +39,19 @@ jobs: id: apache_revision - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -59,7 +59,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: ./alpine${{ matrix.alpine }}/Dockerfile build-args: | @@ -75,7 +75,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./alpine${{ matrix.alpine }}/Dockerfile @@ -93,7 +93,7 @@ jobs: name: Build and push default id: docker_build_default if: matrix.alpine == '3.24' - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./alpine${{ matrix.alpine }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1333499..31e8fe8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -46,19 +46,19 @@ jobs: id: apache_revision - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -66,7 +66,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./alpine${{ matrix.alpine }}/Dockerfile @@ -89,7 +89,7 @@ jobs: name: Build and push default id: docker_build_default if: matrix.alpine == '3.24' - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./alpine${{ matrix.alpine }}/Dockerfile diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7153006..31e6472 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/VERSION b/VERSION index 7cbea07..8044406 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0 \ No newline at end of file +5.2.1 \ No newline at end of file diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 3d3a3c0..11c6756 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index dc242ef..b2dadab 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index e2b01a9..cc6ebfb 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index 7515bd1..aacf2e2 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index bb69fa3..fa8df74 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index f72688f..faea161 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 753f13f..740aa6c 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/overlay/tmp/APACHE_BUILD b/alpine3.21/overlay/tmp/APACHE_BUILD index 81b63b6..d93f37a 100644 --- a/alpine3.21/overlay/tmp/APACHE_BUILD +++ b/alpine3.21/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.67-r0 \ No newline at end of file +2.4.68-r0 \ No newline at end of file diff --git a/alpine3.21/overlay/tmp/APACHE_REVISION b/alpine3.21/overlay/tmp/APACHE_REVISION index e282d58..598bf87 100644 --- a/alpine3.21/overlay/tmp/APACHE_REVISION +++ b/alpine3.21/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.67 \ No newline at end of file +2.4.68 \ No newline at end of file diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index 519d81d..205b904 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/overlay/tmp/APACHE_BUILD b/alpine3.22/overlay/tmp/APACHE_BUILD index 81b63b6..d93f37a 100644 --- a/alpine3.22/overlay/tmp/APACHE_BUILD +++ b/alpine3.22/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.67-r0 \ No newline at end of file +2.4.68-r0 \ No newline at end of file diff --git a/alpine3.22/overlay/tmp/APACHE_REVISION b/alpine3.22/overlay/tmp/APACHE_REVISION index e282d58..598bf87 100644 --- a/alpine3.22/overlay/tmp/APACHE_REVISION +++ b/alpine3.22/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.67 \ No newline at end of file +2.4.68 \ No newline at end of file diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index bb6e042..6a94c34 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/overlay/tmp/APACHE_BUILD b/alpine3.23/overlay/tmp/APACHE_BUILD index 81b63b6..d93f37a 100644 --- a/alpine3.23/overlay/tmp/APACHE_BUILD +++ b/alpine3.23/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.67-r0 \ No newline at end of file +2.4.68-r0 \ No newline at end of file diff --git a/alpine3.23/overlay/tmp/APACHE_REVISION b/alpine3.23/overlay/tmp/APACHE_REVISION index e282d58..598bf87 100644 --- a/alpine3.23/overlay/tmp/APACHE_REVISION +++ b/alpine3.23/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.67 \ No newline at end of file +2.4.68 \ No newline at end of file diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile index 3e58a9c..7b95682 100644 --- a/alpine3.24/Dockerfile +++ b/alpine3.24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.24/overlay/tmp/APACHE_BUILD b/alpine3.24/overlay/tmp/APACHE_BUILD index 81b63b6..d93f37a 100644 --- a/alpine3.24/overlay/tmp/APACHE_BUILD +++ b/alpine3.24/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.67-r0 \ No newline at end of file +2.4.68-r0 \ No newline at end of file diff --git a/alpine3.24/overlay/tmp/APACHE_REVISION b/alpine3.24/overlay/tmp/APACHE_REVISION index e282d58..598bf87 100644 --- a/alpine3.24/overlay/tmp/APACHE_REVISION +++ b/alpine3.24/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.67 \ No newline at end of file +2.4.68 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 6498c04..57b72bf 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.2.0" +BASE_VERSION="6.3.0" echo "Base: ${BASE_VERSION}" ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23 3.24"