From 4fa82250d6e0928fed979867194cb14b2c4e6505 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Jun 2025 14:22:53 +0100 Subject: [PATCH 1/4] Bumping version to 4.3.5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a6695ff..bbdf097 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.4 \ No newline at end of file +4.3.5 \ No newline at end of file From 7e6d404ab8489a8c873eba2b5b6a6d0dcf56c6c1 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Jun 2025 14:26:30 +0100 Subject: [PATCH 2/4] Using latest base images --- alpine3.15/Dockerfile | 2 +- alpine3.16/Dockerfile | 2 +- alpine3.17/Dockerfile | 2 +- alpine3.18/Dockerfile | 2 +- alpine3.19/Dockerfile | 2 +- alpine3.20/Dockerfile | 2 +- alpine3.21/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index a7203a6..d0f64e3 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index 92c8ae4..64e53db 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 846a2dc..179d8ed 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index 285636b..6c801a5 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 943e983..06fe401 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.19-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index 993f78c..8dea8ef 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 9e86454..1b63356 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.4 +FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.6.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" From a756c52fb5c46edf09d0f991c0086827454f233d Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Jun 2025 14:26:55 +0100 Subject: [PATCH 3/4] Adding Alpine 3.22 build as default --- .github/workflows/dev.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- alpine3.22/Dockerfile | 21 +++++++++++++++++++++ alpine3.22/overlay/tmp/APACHE_BUILD | 1 + alpine3.22/overlay/tmp/APACHE_REVISION | 1 + generate-dockerfiles.sh | 4 ++-- 6 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 alpine3.22/Dockerfile create mode 100644 alpine3.22/overlay/tmp/APACHE_BUILD create mode 100644 alpine3.22/overlay/tmp/APACHE_REVISION diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index be8fd0b..4c7a509 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21" ] + alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22" ] runs-on: ubuntu-latest steps: - @@ -92,7 +92,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.alpine == '3.21' + if: matrix.alpine == '3.22' uses: docker/build-push-action@v6 with: context: . diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 698183f..0aca412 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21" ] + alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22" ] runs-on: ubuntu-latest steps: - @@ -88,7 +88,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.alpine == '3.21' + if: matrix.alpine == '3.22' uses: docker/build-push-action@v6 with: context: . diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile new file mode 100644 index 0000000..73e2f14 --- /dev/null +++ b/alpine3.22/Dockerfile @@ -0,0 +1,21 @@ +FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.0 + +LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" + +ARG BF_IMAGE +ARG BF_PUBLISHING +ARG BF_VERSION + +EXPOSE 80 + +COPY ./overlay / +COPY ./alpine3.22/overlay / + +ENV \ + # set to 1 if you want to stop the container generating default httpd.conf at startup - + # if you do this you'll need to provide your own using a bind point + BF_APACHE_USE_CUSTOM_CONF=0 + +RUN bf-install + +VOLUME [ "/www" ] diff --git a/alpine3.22/overlay/tmp/APACHE_BUILD b/alpine3.22/overlay/tmp/APACHE_BUILD new file mode 100644 index 0000000..565674c --- /dev/null +++ b/alpine3.22/overlay/tmp/APACHE_BUILD @@ -0,0 +1 @@ +2.4.63-r4 \ No newline at end of file diff --git a/alpine3.22/overlay/tmp/APACHE_REVISION b/alpine3.22/overlay/tmp/APACHE_REVISION new file mode 100644 index 0000000..1fc6654 --- /dev/null +++ b/alpine3.22/overlay/tmp/APACHE_REVISION @@ -0,0 +1 @@ +2.4.63 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 024ec7a..eaff04f 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,10 +4,10 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.5.4" +BASE_VERSION="5.6.0" echo "Base: ${BASE_VERSION}" -ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21" +ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22" for V in ${ALPINE_EDITIONS} ; do echo "Apache for Alpine ${V}" From 91e1af72e7394e58f0d9822bd781cb878ed1530e Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Jun 2025 14:27:02 +0100 Subject: [PATCH 4/4] Using GitHub CLI for auto PR --- .github/workflows/auto-pr.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index ae26510..54c3776 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -8,14 +8,11 @@ jobs: if: github.ref_type == 'branch' runs-on: ubuntu-latest steps: - - - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v4 - - - name: Create Pull Request - uses: bfren/pull-request@v2 - with: - github_token: ${{ secrets.PAT }} - destination_branch: main - pr_title: ${{ github.ref_name }} - pr_body: "Merging branch to create ${{ github.ref_name }}." + - + name: Checkout Branch ${{ github.ref_name }} + uses: actions/checkout@v4 + - + name: Create Pull Request + run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." + env: + GITHUB_TOKEN: ${{ secrets.PAT }}