diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 9aa55a1..2b833ff 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", "3.23" ] + alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22", "3.23", "3.24" ] runs-on: ubuntu-latest steps: - @@ -92,7 +92,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.alpine == '3.23' + if: matrix.alpine == '3.24' uses: docker/build-push-action@v6 with: context: . diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8fc3725..1333499 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", "3.23" ] + alpine: [ "3.15", "3.16", "3.17", "3.18", "3.19", "3.20", "3.21", "3.22", "3.23", "3.24" ] runs-on: ubuntu-latest steps: - @@ -88,7 +88,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.alpine == '3.23' + if: matrix.alpine == '3.24' uses: docker/build-push-action@v6 with: context: . diff --git a/VERSION b/VERSION index a106d2a..7cbea07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.8 \ No newline at end of file +5.2.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 8336407..341d0b5 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -5.1 \ No newline at end of file +5.2 \ No newline at end of file diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 3e96ae4..3d3a3c0 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index a6988d0..dc242ef 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index ded96ae..e2b01a9 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index 55873b6..7515bd1 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 29d6997..bb69fa3 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index ddd4976..f72688f 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index e4baa7a..753f13f 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index d58e293..519d81d 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index c07ba91..bb6e042 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.9 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.2.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile new file mode 100644 index 0000000..3e58a9c --- /dev/null +++ b/alpine3.24/Dockerfile @@ -0,0 +1,21 @@ +FROM quay.io/bfren/alpine-s6:alpine3.24-6.2.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.24/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.24/overlay/tmp/APACHE_BUILD b/alpine3.24/overlay/tmp/APACHE_BUILD new file mode 100644 index 0000000..81b63b6 --- /dev/null +++ b/alpine3.24/overlay/tmp/APACHE_BUILD @@ -0,0 +1 @@ +2.4.67-r0 \ No newline at end of file diff --git a/alpine3.24/overlay/tmp/APACHE_REVISION b/alpine3.24/overlay/tmp/APACHE_REVISION new file mode 100644 index 0000000..e282d58 --- /dev/null +++ b/alpine3.24/overlay/tmp/APACHE_REVISION @@ -0,0 +1 @@ +2.4.67 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 3c3da92..6498c04 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,10 +4,10 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.1.9" +BASE_VERSION="6.2.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" +ALPINE_EDITIONS="3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23 3.24" for V in ${ALPINE_EDITIONS} ; do echo "Apache for Alpine ${V}"