diff --git a/VERSION b/VERSION index e3384b3..e60200b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.4 \ No newline at end of file +5.2.5 \ No newline at end of file diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 3e963da..76bd48c 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index b844220..c408029 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index 27fd1d9..e0b28e2 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index fda1dd8..ef58eba 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index 21cd881..bb6f7e5 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index f96e05c..e803132 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index 4237bfc..a4c8a35 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index c9cefb7..02aefc8 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index 9ad68c0..aff46e4 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile index ef9f7d6..cb3cc76 100644 --- a/alpine3.24/Dockerfile +++ b/alpine3.24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.4.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index a2ec217..c0850a6 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.4.0" +BASE_VERSION="6.5.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" diff --git a/overlay/etc/nu/scripts/bf-apache/mod.nu b/overlay/etc/nu/scripts/bf-apache/mod.nu index 78d2b4f..c57415a 100644 --- a/overlay/etc/nu/scripts/bf-apache/mod.nu +++ b/overlay/etc/nu/scripts/bf-apache/mod.nu @@ -1,3 +1,2 @@ -export module conf.nu -export module ctl.nu -export module run.nu +export use conf.nu +export use ctl.nu diff --git a/overlay/etc/nu/scripts/bf-apache/run.nu b/overlay/etc/nu/scripts/bf-apache/run.nu deleted file mode 100644 index 5a0483c..0000000 --- a/overlay/etc/nu/scripts/bf-apache/run.nu +++ /dev/null @@ -1,26 +0,0 @@ -use bf -use conf.nu -use ctl.nu - -export def preflight [] { - # load environment - bf env load - - # manually set executing script - bf env x_set --override run apache - - # Mark Apache as starting - ctl starting - - # if Apache is already running, exit gracefully - if (ctl is_up) { - bf write debug "Apache is already running." - exit 0 - } - - # Test Apache configuration - conf test - - # if we get here we are ready to start Apache - bf write "Starting Apache in foreground mode." -} diff --git a/overlay/etc/s6-overlay/s6-rc.d/apache/run b/overlay/etc/s6-overlay/s6-rc.d/apache/run index c101f27..b67a5ad 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/apache/run +++ b/overlay/etc/s6-overlay/s6-rc.d/apache/run @@ -1,21 +1,36 @@ -#!/bin/withenv sh +#!/usr/bin/nu -set -euo pipefail +use bf +use bf-apache [conf ctl] +use bf-s6 +bf env load +# Start Apache as a foreground service +def main [ + name: string # The service name, passed by s6-supervise +] { + # set executable name - used to make log output more useful + bf env x_set --override run $name -#====================================================================================================================== -# Run preflight checks -#====================================================================================================================== - -nu -c "use bf-apache run ; run preflight" + # run checks before executing service + ctl starting + # if Apache is already running, exit gracefully + if (ctl is_up) { + bf write debug "Apache is already running." + exit 0 + } -#====================================================================================================================== -# Start Apache as a foreground service -# -# Flags: -# -D set daemon mode -# -f set configuration file path -#====================================================================================================================== + # test Apache configuration + conf test -exec httpd -D FOREGROUND -f "${BF_APACHE_CONF}" + # flags: + # -D set daemon mode + # -f set configuration file path + bf write "Starting Apache in foreground mode." + let args = [ + "-D" "FOREGROUND" + "-f" (bf env APACHE_CONF) + ] + bf-s6 svc launch httpd ...$args +}