diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 0000000..a13010f --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1 @@ +@../index/CLAUDE.md diff --git a/VERSION b/VERSION index e60200b..4ddd9ad 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.5 \ No newline at end of file +5.2.6 \ No newline at end of file diff --git a/alpine3.15/Dockerfile b/alpine3.15/Dockerfile index 76bd48c..31a2fa9 100644 --- a/alpine3.15/Dockerfile +++ b/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.16/Dockerfile b/alpine3.16/Dockerfile index c408029..462571d 100644 --- a/alpine3.16/Dockerfile +++ b/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.17/Dockerfile b/alpine3.17/Dockerfile index e0b28e2..c53fb45 100644 --- a/alpine3.17/Dockerfile +++ b/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.18/Dockerfile b/alpine3.18/Dockerfile index ef58eba..9269ff8 100644 --- a/alpine3.18/Dockerfile +++ b/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.19/Dockerfile b/alpine3.19/Dockerfile index bb6f7e5..cf2686d 100644 --- a/alpine3.19/Dockerfile +++ b/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.19-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.19-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.20/Dockerfile b/alpine3.20/Dockerfile index e803132..6a7dd48 100644 --- a/alpine3.20/Dockerfile +++ b/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.21/Dockerfile b/alpine3.21/Dockerfile index a4c8a35..c1eb96f 100644 --- a/alpine3.21/Dockerfile +++ b/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.21-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.21-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.22/Dockerfile b/alpine3.22/Dockerfile index 02aefc8..6036862 100644 --- a/alpine3.22/Dockerfile +++ b/alpine3.22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.23/Dockerfile b/alpine3.23/Dockerfile index aff46e4..18ac9db 100644 --- a/alpine3.23/Dockerfile +++ b/alpine3.23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.23-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile index cb3cc76..6fe8a01 100644 --- a/alpine3.24/Dockerfile +++ b/alpine3.24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.5.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.6.0-dev LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index c0850a6..e20482e 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.5.0" +BASE_VERSION="6.6.0-dev" 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/bf/init.d/11-config.nu b/overlay/etc/bf/init.d/11-config.nu index d7d7eec..28e9cc8 100644 --- a/overlay/etc/bf/init.d/11-config.nu +++ b/overlay/etc/bf/init.d/11-config.nu @@ -1,4 +1,5 @@ use bf +use bf-s6 bf env load # Generate Apache configuration @@ -11,5 +12,5 @@ def main [] { # generate configuration from template bf write "Generating Apache configuration." - bf esh template $"(bf env APACHE_CONF)" + bf-s6 esh template $"(bf env APACHE_CONF)" } diff --git a/overlay/etc/bf/init.d/12-htdocs.nu b/overlay/etc/bf/init.d/12-htdocs.nu index 2b390c2..809e312 100644 --- a/overlay/etc/bf/init.d/12-htdocs.nu +++ b/overlay/etc/bf/init.d/12-htdocs.nu @@ -1,4 +1,5 @@ use bf +use bf-s6 bf env load # Ensure the htdocs directory exists @@ -15,7 +16,7 @@ def main [] { bf write $"Creating ($htdocs)." mkdir $htdocs cp $"(bf env ETC_SRC)/index.html" $htdocs - bf ch apply_file "11-apache-www" + bf-s6 ch apply_file "11-apache-www" # return nothing return diff --git a/overlay/usr/bin/bf/healthcheck b/overlay/usr/bin/bf/bf-healthcheck similarity index 100% rename from overlay/usr/bin/bf/healthcheck rename to overlay/usr/bin/bf/bf-healthcheck