From 6805a7094448f61fb4ef8ffe2292d6c0b4d06b44 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 08:56:39 +0100 Subject: [PATCH 1/3] Bumping version to 4.2.5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 74ecad8..ad35fe0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.4 \ No newline at end of file +4.2.5 \ No newline at end of file From 25330ce79cbe7b576e8777286b7497c714b3e156 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 08:56:53 +0100 Subject: [PATCH 2/3] Using Nushell in S6 service run file --- overlay/etc/nu/scripts/bf-node/mod.nu | 1 - overlay/etc/nu/scripts/bf-node/run.nu | 13 ---------- overlay/etc/s6-overlay/s6-rc.d/node/run | 32 +++++++++++++++---------- 3 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 overlay/etc/nu/scripts/bf-node/run.nu diff --git a/overlay/etc/nu/scripts/bf-node/mod.nu b/overlay/etc/nu/scripts/bf-node/mod.nu index 75d97e1..e69de29 100644 --- a/overlay/etc/nu/scripts/bf-node/mod.nu +++ b/overlay/etc/nu/scripts/bf-node/mod.nu @@ -1 +0,0 @@ -export module run.nu diff --git a/overlay/etc/nu/scripts/bf-node/run.nu b/overlay/etc/nu/scripts/bf-node/run.nu deleted file mode 100644 index 555b1c8..0000000 --- a/overlay/etc/nu/scripts/bf-node/run.nu +++ /dev/null @@ -1,13 +0,0 @@ -use bf - -# Run preflight checks before executing process -export def preflight [] { - # load environment - bf env load - - # manually set executing script - bf env x_set --override run node - - # if we get here we are ready to start Node.js - bf write "Starting Node.js." -} diff --git a/overlay/etc/s6-overlay/s6-rc.d/node/run b/overlay/etc/s6-overlay/s6-rc.d/node/run index 6472ec7..8a4b560 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/node/run +++ b/overlay/etc/s6-overlay/s6-rc.d/node/run @@ -1,17 +1,23 @@ -#!/bin/withenv sh +#!/usr/bin/nu -set -euo pipefail +use bf +use bf-s6 +bf env load +# Start the Node.js server as the node user +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 -#====================================================================================================================== + # run checks before executing service + bf write debug "No pre-run checks required." -nu -c "use bf-node run ; run preflight" - - -#====================================================================================================================== -# Start Node.js server -#====================================================================================================================== - -exec s6-setuidgid node node ${BF_NODE_RUN} + # launch Node.js service + bf write "Starting Node.js." + let args = [ + (bf env NODE_RUN) + ] + bf-s6 svc launch s6-setuidgid node node ...$args +} From 671ffaea31fcb614f7ce3d75d752d9569b8d90e1 Mon Sep 17 00:00:00 2001 From: bfren Date: Mon, 12 Oct 2026 08:57:09 +0100 Subject: [PATCH 3/3] Using latest base images --- 16/Dockerfile | 2 +- 17/Dockerfile | 2 +- 18/Dockerfile | 2 +- 19/Dockerfile | 2 +- 20/Dockerfile | 2 +- 21/Dockerfile | 2 +- 22/Dockerfile | 2 +- 23/Dockerfile | 2 +- 24/Dockerfile | 2 +- 26/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/16/Dockerfile b/16/Dockerfile index ba4f9bb..4195c86 100644 --- a/16/Dockerfile +++ b/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-node" diff --git a/17/Dockerfile b/17/Dockerfile index 02e938c..fcd08c2 100644 --- a/17/Dockerfile +++ b/17/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-node" diff --git a/18/Dockerfile b/18/Dockerfile index eb4974a..9066f16 100644 --- a/18/Dockerfile +++ b/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-node" diff --git a/19/Dockerfile b/19/Dockerfile index a5645b4..382ae97 100644 --- a/19/Dockerfile +++ b/19/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-node" diff --git a/20/Dockerfile b/20/Dockerfile index f888fea..87c4a0e 100644 --- a/20/Dockerfile +++ b/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-node" diff --git a/21/Dockerfile b/21/Dockerfile index 29bade0..9f203a4 100644 --- a/21/Dockerfile +++ b/21/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-node" diff --git a/22/Dockerfile b/22/Dockerfile index 852c321..aa19ace 100644 --- a/22/Dockerfile +++ b/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-node" diff --git a/23/Dockerfile b/23/Dockerfile index c29e1ab..baccc21 100644 --- a/23/Dockerfile +++ b/23/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-node" diff --git a/24/Dockerfile b/24/Dockerfile index edbd090..95d8605 100644 --- a/24/Dockerfile +++ b/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-node" diff --git a/26/Dockerfile b/26/Dockerfile index 527409f..6f1f30f 100644 --- a/26/Dockerfile +++ b/26/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-node" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index db66098..8391949 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}" NODE_VERSIONS="16 17 18 19 20 21 22 23 24 26"