diff --git a/16/Dockerfile b/16/Dockerfile index 752ce2e..16d32e4 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/17/Dockerfile b/17/Dockerfile index 2a9a08b..3c26590 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/18/Dockerfile b/18/Dockerfile index 1de02d2..cf88b0e 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/19/Dockerfile b/19/Dockerfile index ffe523e..7ad2822 100644 --- a/19/Dockerfile +++ b/19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/20/Dockerfile b/20/Dockerfile index 1e37ec0..1aa2e37 100644 --- a/20/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/21/Dockerfile b/21/Dockerfile index ae40a38..944196a 100644 --- a/21/Dockerfile +++ b/21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/22/Dockerfile b/22/Dockerfile index e88bd35..81317cf 100644 --- a/22/Dockerfile +++ b/22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/23/Dockerfile b/23/Dockerfile index 1b144e8..2fbdff3 100644 --- a/23/Dockerfile +++ b/23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/24/Dockerfile b/24/Dockerfile index 9a02871..ac42869 100644 --- a/24/Dockerfile +++ b/24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/26/Dockerfile b/26/Dockerfile index e80e2b8..ae46352 100644 --- a/26/Dockerfile +++ b/26/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.2 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.3.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/VERSION b/VERSION index 078bf8b..ec87108 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.2 \ No newline at end of file +4.2.3 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index b700613..94af311 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.3.2" +BASE_VERSION="6.3.3" echo "Base: ${BASE_VERSION}" NODE_VERSIONS="16 17 18 19 20 21 22 23 24 26" diff --git a/overlay/etc/s6-overlay/s6-rc.d/node/run b/overlay/etc/s6-overlay/s6-rc.d/node/run index b1ad961..6472ec7 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/node/run +++ b/overlay/etc/s6-overlay/s6-rc.d/node/run @@ -14,4 +14,4 @@ nu -c "use bf-node run ; run preflight" # Start Node.js server #====================================================================================================================== -s6-setuidgid node node ${BF_NODE_RUN} +exec s6-setuidgid node node ${BF_NODE_RUN} diff --git a/overlay/etc/s6-overlay/s6-rc.d/user/contents.d/node b/overlay/etc/s6-overlay/user-bundles.d/user/contents.d/node similarity index 100% rename from overlay/etc/s6-overlay/s6-rc.d/user/contents.d/node rename to overlay/etc/s6-overlay/user-bundles.d/user/contents.d/node