From 5acc3763abd16a2c12fdb6e27e07879deb06e1b2 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 10:04:54 +0100 Subject: [PATCH 1/4] Bumping version to 5.2.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fb467b1..fff6bf3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.2 \ No newline at end of file +5.2.3 \ No newline at end of file From 78923b33c4851de73f58ff524854ba790091aa2e Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 10:05:12 +0100 Subject: [PATCH 2/4] Moving to S6 Overlay user-bundles.d --- .../s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/apache | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename overlay/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/apache (100%) diff --git a/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/apache b/overlay/etc/s6-overlay/user-bundles.d/user/contents.d/apache similarity index 100% rename from overlay/etc/s6-overlay/s6-rc.d/user/contents.d/apache rename to overlay/etc/s6-overlay/user-bundles.d/user/contents.d/apache From 43a5c1b8b9d2d4dc1a4d61409f89e8fa4840628f Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 10:05:16 +0100 Subject: [PATCH 3/4] Adding exec to run services correctly --- overlay/etc/s6-overlay/s6-rc.d/apache/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/etc/s6-overlay/s6-rc.d/apache/run b/overlay/etc/s6-overlay/s6-rc.d/apache/run index 1c2e030..c101f27 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/apache/run +++ b/overlay/etc/s6-overlay/s6-rc.d/apache/run @@ -18,4 +18,4 @@ nu -c "use bf-apache run ; run preflight" # -f set configuration file path #====================================================================================================================== -apachectl start -D FOREGROUND -f "${BF_APACHE_CONF}" +exec httpd -D FOREGROUND -f "${BF_APACHE_CONF}" From 0b15d3387eade0a7b8246cc5d4a2783792a69fd4 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 10:05:34 +0100 Subject: [PATCH 4/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 +- alpine3.22/Dockerfile | 2 +- alpine3.23/Dockerfile | 2 +- alpine3.24/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 305f091..7ed5a7d 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index c0cdb06..1681a53 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 4034783..7425332 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index c1b6f23..de49304 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index e9e82a3..bd5db98 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index 2dc4c34..38339bf 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index b7cc8cf..20ac47f 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index 5536130..dedff88 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index dd1d2d3..d5dba60 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile index 0783a51..fb5c3e5 100644 --- a/alpine3.24/Dockerfile +++ b/alpine3.24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 889a912..8c7ff30 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.3.2" +BASE_VERSION="6.3.3" 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"