diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 4e5b4a9..7153006 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -24,7 +24,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Update repo description with README.md - uses: peter-evans/dockerhub-description@v3 + uses: peter-evans/dockerhub-description@v5 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/workflow-cleanup.yml b/.github/workflows/workflow-cleanup.yml index 36fcf4f..3bcccd8 100644 --- a/.github/workflows/workflow-cleanup.yml +++ b/.github/workflows/workflow-cleanup.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Delete old workflow runs - uses: bfren/delete-workflow-runs@main + uses: bfren/delete-workflow-runs@v2 with: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} diff --git a/VERSION b/VERSION index acf69b4..3bff059 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.0 \ No newline at end of file +5.1.1 \ No newline at end of file diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 01e9fb7..f53db56 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.1.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index 2589ed5..da99b66 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.1.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 949d0d4..bb7a9c2 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.1.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index 4ab50c9..fc66f2d 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.1.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 1a0abe4..0637146 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.1.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index e4feb84..08b7611 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/overlay/tmp/APACHE_BUILD b/alpine3.20/overlay/tmp/APACHE_BUILD index c1c5567..a1c6421 100644 --- a/alpine3.20/overlay/tmp/APACHE_BUILD +++ b/alpine3.20/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.65-r0 \ No newline at end of file +2.4.66-r0 \ No newline at end of file diff --git a/alpine3.20/overlay/tmp/APACHE_REVISION b/alpine3.20/overlay/tmp/APACHE_REVISION index c63659f..b6b1596 100644 --- a/alpine3.20/overlay/tmp/APACHE_REVISION +++ b/alpine3.20/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.65 \ No newline at end of file +2.4.66 \ No newline at end of file diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 3e736dc..5d37c90 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.1.1 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 c1c5567..a1c6421 100644 --- a/alpine3.21/overlay/tmp/APACHE_BUILD +++ b/alpine3.21/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.65-r0 \ No newline at end of file +2.4.66-r0 \ No newline at end of file diff --git a/alpine3.21/overlay/tmp/APACHE_REVISION b/alpine3.21/overlay/tmp/APACHE_REVISION index c63659f..b6b1596 100644 --- a/alpine3.21/overlay/tmp/APACHE_REVISION +++ b/alpine3.21/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.65 \ No newline at end of file +2.4.66 \ No newline at end of file diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index 2743ae7..65701e2 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.1 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 c1c5567..a1c6421 100644 --- a/alpine3.22/overlay/tmp/APACHE_BUILD +++ b/alpine3.22/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.65-r0 \ No newline at end of file +2.4.66-r0 \ No newline at end of file diff --git a/alpine3.22/overlay/tmp/APACHE_REVISION b/alpine3.22/overlay/tmp/APACHE_REVISION index c63659f..b6b1596 100644 --- a/alpine3.22/overlay/tmp/APACHE_REVISION +++ b/alpine3.22/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.65 \ No newline at end of file +2.4.66 \ No newline at end of file diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index be9194c..e75891e 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.0 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.1 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 c1c5567..a1c6421 100644 --- a/alpine3.23/overlay/tmp/APACHE_BUILD +++ b/alpine3.23/overlay/tmp/APACHE_BUILD @@ -1 +1 @@ -2.4.65-r0 \ No newline at end of file +2.4.66-r0 \ No newline at end of file diff --git a/alpine3.23/overlay/tmp/APACHE_REVISION b/alpine3.23/overlay/tmp/APACHE_REVISION index c63659f..b6b1596 100644 --- a/alpine3.23/overlay/tmp/APACHE_REVISION +++ b/alpine3.23/overlay/tmp/APACHE_REVISION @@ -1 +1 @@ -2.4.65 \ No newline at end of file +2.4.66 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 35ff7c2..36165f7 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.1.0" +BASE_VERSION="6.1.1" echo "Base: ${BASE_VERSION}" ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23"