From a97c92f4722afee1395a151e6567605d362222cb Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 14:47:12 +0100 Subject: [PATCH 1/3] Bumping version to 5.2.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fff6bf3..e3384b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.3 \ No newline at end of file +5.2.4 \ No newline at end of file From 23f57d4197348070f08d20b1432b14c44fe20279 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 14:47:38 +0100 Subject: [PATCH 2/3] Using new container termination --- overlay/etc/s6-overlay/s6-rc.d/apache/finish | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/overlay/etc/s6-overlay/s6-rc.d/apache/finish b/overlay/etc/s6-overlay/s6-rc.d/apache/finish index 2631c23..967df5e 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/apache/finish +++ b/overlay/etc/s6-overlay/s6-rc.d/apache/finish @@ -5,8 +5,8 @@ use bf-apache use bf-s6 bf env load -x apache -# Ensure Apache is closed gracefully and use base executable to terminate all services. -# If we are restarting, do nothing. +# Terminate container if Apache failed - if we are restarting, do nothing. +# Apache itself is stopped by s6, which sends httpd its down signal (SIGTERM by default) def main [...args] { # if Apache is marked as being restarted, do nothing if (bf-apache ctl is_restarting) { @@ -14,9 +14,6 @@ def main [...args] { return } - # ensure Apache is stopped gracefully - bf-apache ctl stop - # finish and terminate container - bf-s6 svc finish --terminate + bf-s6 svc finish --terminate ...$args } From 4471c78aebd70a8c5b45c407c355e68ae0a0800e Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 11 Oct 2026 14:47:57 +0100 Subject: [PATCH 3/3] 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 7ed5a7d..3e963da 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index 1681a53..b844220 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 7425332..27fd1d9 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index de49304..fda1dd8 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index bd5db98..21cd881 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index 38339bf..f96e05c 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 20ac47f..4237bfc 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index dedff88..c9cefb7 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index d5dba60..9ad68c0 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile index fb5c3e5..ef9f7d6 100644 --- a/alpine3.24/Dockerfile +++ b/alpine3.24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 8c7ff30..a2ec217 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.3.3" +BASE_VERSION="6.4.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 3.24"