From c6b930272a9a1bef5feca76639d996eccbfe8b81 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:52:12 +0000 Subject: [PATCH 1/5] Bumping version to 5.0.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 32f3eaa..3e827a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.1 \ No newline at end of file +5.0.2 \ No newline at end of file From b2ec25dec872aed43926ce6a5c26c486f90a1f22 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:53:01 +0000 Subject: [PATCH 2/5] Adding Alpine 3.23 --- .github/workflows/dev.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- alpine3.23/Dockerfile | 21 +++++++++++++++++++++ alpine3.23/overlay/tmp/APACHE_BUILD | 1 + alpine3.23/overlay/tmp/APACHE_REVISION | 1 + generate-dockerfiles.sh | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 alpine3.23/Dockerfile create mode 100644 alpine3.23/overlay/tmp/APACHE_BUILD create mode 100644 alpine3.23/overlay/tmp/APACHE_REVISION diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 56a8456..9aa55a1 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", "3.22" ] + alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22", "3.23" ] runs-on: ubuntu-latest steps: - @@ -92,7 +92,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.alpine == '3.22' + if: matrix.alpine == '3.23' uses: docker/build-push-action@v6 with: context: . diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 63a88ef..8fc3725 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", "3.22" ] + alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22", "3.23" ] runs-on: ubuntu-latest steps: - @@ -88,7 +88,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.alpine == '3.22' + if: matrix.alpine == '3.23' uses: docker/build-push-action@v6 with: context: . diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile new file mode 100644 index 0000000..078e85f --- /dev/null +++ b/alpine3.23/Dockerfile @@ -0,0 +1,21 @@ +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 + +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.23/overlay/tmp/APACHE_BUILD b/alpine3.23/overlay/tmp/APACHE_BUILD new file mode 100644 index 0000000..c1c5567 --- /dev/null +++ b/alpine3.23/overlay/tmp/APACHE_BUILD @@ -0,0 +1 @@ +2.4.65-r0 \ No newline at end of file diff --git a/alpine3.23/overlay/tmp/APACHE_REVISION b/alpine3.23/overlay/tmp/APACHE_REVISION new file mode 100644 index 0000000..c63659f --- /dev/null +++ b/alpine3.23/overlay/tmp/APACHE_REVISION @@ -0,0 +1 @@ +2.4.65 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index b53dfe3..9760247 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BASE_VERSION="6.0.1" echo "Base: ${BASE_VERSION}" -ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22" +ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23" for V in ${ALPINE_EDITIONS} ; do echo "Apache for Alpine ${V}" From d2ac9ce2c66a0f4bc3c3e95c6f8f8d303d42853d Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:53:15 +0000 Subject: [PATCH 3/5] Bumping version to 5.1.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 3e827a3..acf69b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.2 \ No newline at end of file +5.1.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 6e63660..8336407 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -5.0 \ No newline at end of file +5.1 \ No newline at end of file From d2902e416c2cb5e4e50da1c4eb66b17659a85877 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:53:31 +0000 Subject: [PATCH 4/5] Making Alpine 3.23 the default --- run.sh | 2 +- test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 7790520..3aa897d 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ #!/bin/sh IMAGE=`cat VERSION` -ALPINE=${1:-3.21} +ALPINE=${1:-3.23} docker buildx build \ --load \ diff --git a/test.sh b/test.sh index 450afa5..74ed92b 100644 --- a/test.sh +++ b/test.sh @@ -2,7 +2,7 @@ IMAGE=apache VERSION=`cat VERSION` -ALPINE=${1:-3.21} +ALPINE=${1:-3.23} TAG=${IMAGE}-test docker buildx build \ From 8c4efc1a4e2fd14662b749382229a7e228c10961 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:54:18 +0000 Subject: [PATCH 5/5] 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 +- alpine3.22/Dockerfile | 2 +- alpine3.23/Dockerfile | 4 ++-- generate-dockerfiles.sh | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 9ce1d3a..01e9fb7 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index e38858b..2589ed5 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 1c86c27..949d0d4 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index fc0b7a7..4ab50c9 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 844d860..1a0abe4 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index 5d3bcd2..e4feb84 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 5236504..3e736dc 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index 078e85f..2743ae7 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index 078e85f..be9194c 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" @@ -9,7 +9,7 @@ ARG BF_VERSION EXPOSE 80 COPY ./overlay / -COPY ./alpine3.22/overlay / +COPY ./alpine3.23/overlay / ENV \ # set to 1 if you want to stop the container generating default httpd.conf at startup - diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 9760247..35ff7c2 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.0.1" +BASE_VERSION="6.1.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"