v5.2.4

VERSION

@@ -1 +1 @@
-5.2.3
+5.2.4

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"

overlay/etc/s6-overlay/s6-rc.d/apache/finish

@@ -5,18 +5,15 @@ 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) {
         bf write debug "Apache is restarting, do not terminate container."
         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
 }