diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4ba827a..6019e53 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - node: [ "16", "17", "18", "19", "20", "21", "22", "23", "24", "26" ] + node: [ "20", "21", "22", "23", "24", "26" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 82570fe..e062358 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - node: [ "16", "17", "18", "19", "20", "21", "22", "23", "24", "26" ] + node: [ "20", "21", "22", "23", "24", "26" ] runs-on: ubuntu-latest steps: - diff --git a/16/ALPINE_MINOR b/16/ALPINE_MINOR deleted file mode 100644 index 1bc446c..0000000 --- a/16/ALPINE_MINOR +++ /dev/null @@ -1 +0,0 @@ -3.16 \ No newline at end of file diff --git a/16/Dockerfile b/16/Dockerfile deleted file mode 100644 index 70d1e1c..0000000 --- a/16/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.7.2 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -EXPOSE 3000 - -COPY ./overlay / -COPY ./16/overlay / - -RUN bf-install - -VOLUME [ "/app/live" ] diff --git a/16/PKG.url b/16/PKG.url deleted file mode 100644 index 70deac4..0000000 --- a/16/PKG.url +++ /dev/null @@ -1 +0,0 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer= diff --git a/16/overlay/tmp/NODE_BUILD b/16/overlay/tmp/NODE_BUILD deleted file mode 100644 index 8a9a74c..0000000 --- a/16/overlay/tmp/NODE_BUILD +++ /dev/null @@ -1 +0,0 @@ -16.20.2-r0 \ No newline at end of file diff --git a/16/overlay/tmp/NODE_MINOR b/16/overlay/tmp/NODE_MINOR deleted file mode 100644 index 54aa58c..0000000 --- a/16/overlay/tmp/NODE_MINOR +++ /dev/null @@ -1 +0,0 @@ -16.20 \ No newline at end of file diff --git a/16/overlay/tmp/NODE_PKG b/16/overlay/tmp/NODE_PKG deleted file mode 100644 index 0c524b7..0000000 --- a/16/overlay/tmp/NODE_PKG +++ /dev/null @@ -1 +0,0 @@ -nodejs \ No newline at end of file diff --git a/16/overlay/tmp/NPM_BUILD b/16/overlay/tmp/NPM_BUILD deleted file mode 100644 index f477bb3..0000000 --- a/16/overlay/tmp/NPM_BUILD +++ /dev/null @@ -1 +0,0 @@ -8.10.0-r0 \ No newline at end of file diff --git a/17/ALPINE_MINOR b/17/ALPINE_MINOR deleted file mode 100644 index 230693c..0000000 --- a/17/ALPINE_MINOR +++ /dev/null @@ -1 +0,0 @@ -3.15 \ No newline at end of file diff --git a/17/Dockerfile b/17/Dockerfile deleted file mode 100644 index 8d0c9c5..0000000 --- a/17/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.7.2 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -EXPOSE 3000 - -COPY ./overlay / -COPY ./17/overlay / - -RUN bf-install - -VOLUME [ "/app/live" ] diff --git a/17/PKG.url b/17/PKG.url deleted file mode 100644 index a69cf9d..0000000 --- a/17/PKG.url +++ /dev/null @@ -1 +0,0 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.15&repo=&arch=&maintainer= diff --git a/17/overlay/tmp/NODE_BUILD b/17/overlay/tmp/NODE_BUILD deleted file mode 100644 index 79a91a1..0000000 --- a/17/overlay/tmp/NODE_BUILD +++ /dev/null @@ -1 +0,0 @@ -17.9.0-r0 \ No newline at end of file diff --git a/17/overlay/tmp/NODE_MINOR b/17/overlay/tmp/NODE_MINOR deleted file mode 100644 index c65aba5..0000000 --- a/17/overlay/tmp/NODE_MINOR +++ /dev/null @@ -1 +0,0 @@ -17.9 \ No newline at end of file diff --git a/17/overlay/tmp/NODE_PKG b/17/overlay/tmp/NODE_PKG deleted file mode 100644 index 1399534..0000000 --- a/17/overlay/tmp/NODE_PKG +++ /dev/null @@ -1 +0,0 @@ -nodejs-current \ No newline at end of file diff --git a/17/overlay/tmp/NPM_BUILD b/17/overlay/tmp/NPM_BUILD deleted file mode 100644 index 415cb33..0000000 --- a/17/overlay/tmp/NPM_BUILD +++ /dev/null @@ -1 +0,0 @@ -8.1.3-r0 \ No newline at end of file diff --git a/18/ALPINE_MINOR b/18/ALPINE_MINOR deleted file mode 100644 index 55b698c..0000000 --- a/18/ALPINE_MINOR +++ /dev/null @@ -1 +0,0 @@ -3.18 \ No newline at end of file diff --git a/18/Dockerfile b/18/Dockerfile deleted file mode 100644 index 363d2be..0000000 --- a/18/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.7.2 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -EXPOSE 3000 - -COPY ./overlay / -COPY ./18/overlay / - -RUN bf-install - -VOLUME [ "/app/live" ] diff --git a/18/PKG.url b/18/PKG.url deleted file mode 100644 index e8822db..0000000 --- a/18/PKG.url +++ /dev/null @@ -1 +0,0 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.18&repo=&arch=&maintainer= diff --git a/18/overlay/tmp/NODE_BUILD b/18/overlay/tmp/NODE_BUILD deleted file mode 100644 index aca85ec..0000000 --- a/18/overlay/tmp/NODE_BUILD +++ /dev/null @@ -1 +0,0 @@ -18.20.1-r0 \ No newline at end of file diff --git a/18/overlay/tmp/NODE_MINOR b/18/overlay/tmp/NODE_MINOR deleted file mode 100644 index 7c254fb..0000000 --- a/18/overlay/tmp/NODE_MINOR +++ /dev/null @@ -1 +0,0 @@ -18.20 \ No newline at end of file diff --git a/18/overlay/tmp/NODE_PKG b/18/overlay/tmp/NODE_PKG deleted file mode 100644 index 0c524b7..0000000 --- a/18/overlay/tmp/NODE_PKG +++ /dev/null @@ -1 +0,0 @@ -nodejs \ No newline at end of file diff --git a/18/overlay/tmp/NPM_BUILD b/18/overlay/tmp/NPM_BUILD deleted file mode 100644 index d27e348..0000000 --- a/18/overlay/tmp/NPM_BUILD +++ /dev/null @@ -1 +0,0 @@ -9.6.6-r0 \ No newline at end of file diff --git a/19/ALPINE_MINOR b/19/ALPINE_MINOR deleted file mode 100644 index 459f037..0000000 --- a/19/ALPINE_MINOR +++ /dev/null @@ -1 +0,0 @@ -3.17 \ No newline at end of file diff --git a/19/Dockerfile b/19/Dockerfile deleted file mode 100644 index 40714ea..0000000 --- a/19/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.7.2 - -LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" - -ARG BF_IMAGE -ARG BF_PUBLISHING -ARG BF_VERSION - -EXPOSE 3000 - -COPY ./overlay / -COPY ./19/overlay / - -RUN bf-install - -VOLUME [ "/app/live" ] diff --git a/19/PKG.url b/19/PKG.url deleted file mode 100644 index 4b49f46..0000000 --- a/19/PKG.url +++ /dev/null @@ -1 +0,0 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.17&repo=&arch=&maintainer= diff --git a/19/overlay/tmp/NODE_BUILD b/19/overlay/tmp/NODE_BUILD deleted file mode 100644 index 3fc3814..0000000 --- a/19/overlay/tmp/NODE_BUILD +++ /dev/null @@ -1 +0,0 @@ -19.7.0-r0 \ No newline at end of file diff --git a/19/overlay/tmp/NODE_MINOR b/19/overlay/tmp/NODE_MINOR deleted file mode 100644 index c0c78a8..0000000 --- a/19/overlay/tmp/NODE_MINOR +++ /dev/null @@ -1 +0,0 @@ -19.7 \ No newline at end of file diff --git a/19/overlay/tmp/NODE_PKG b/19/overlay/tmp/NODE_PKG deleted file mode 100644 index 1399534..0000000 --- a/19/overlay/tmp/NODE_PKG +++ /dev/null @@ -1 +0,0 @@ -nodejs-current \ No newline at end of file diff --git a/19/overlay/tmp/NPM_BUILD b/19/overlay/tmp/NPM_BUILD deleted file mode 100644 index 979231a..0000000 --- a/19/overlay/tmp/NPM_BUILD +++ /dev/null @@ -1 +0,0 @@ -9.1.2-r0 \ No newline at end of file diff --git a/20/Dockerfile b/20/Dockerfile index 81be3ab..7e447e3 100644 --- a/20/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.7.2 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.7.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/21/Dockerfile b/21/Dockerfile index c0cb966..46ab804 100644 --- a/21/Dockerfile +++ b/21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.7.2 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.7.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/22/Dockerfile b/22/Dockerfile index 46d7a71..169c0fe 100644 --- a/22/Dockerfile +++ b/22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.7.2 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.7.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/22/overlay/tmp/NODE_BUILD b/22/overlay/tmp/NODE_BUILD index e267966..23e05db 100644 --- a/22/overlay/tmp/NODE_BUILD +++ b/22/overlay/tmp/NODE_BUILD @@ -1 +1 @@ -22.23.2-r0 \ No newline at end of file +22.23.4-r0 \ No newline at end of file diff --git a/23/Dockerfile b/23/Dockerfile index fd15476..e7bda69 100644 --- a/23/Dockerfile +++ b/23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.7.2 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.7.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/24/Dockerfile b/24/Dockerfile index c04f2b4..901701f 100644 --- a/24/Dockerfile +++ b/24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.7.2 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.7.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/24/overlay/tmp/NODE_BUILD b/24/overlay/tmp/NODE_BUILD index 73c6242..8defac5 100644 --- a/24/overlay/tmp/NODE_BUILD +++ b/24/overlay/tmp/NODE_BUILD @@ -1 +1 @@ -24.18.1-r0 \ No newline at end of file +24.22.1-r0 \ No newline at end of file diff --git a/24/overlay/tmp/NODE_MINOR b/24/overlay/tmp/NODE_MINOR index 555474c..f174cbb 100644 --- a/24/overlay/tmp/NODE_MINOR +++ b/24/overlay/tmp/NODE_MINOR @@ -1 +1 @@ -24.18 \ No newline at end of file +24.22 \ No newline at end of file diff --git a/26/Dockerfile b/26/Dockerfile index a2626f1..ced862b 100644 --- a/26/Dockerfile +++ b/26/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.7.2 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.7.3 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/26/overlay/tmp/NODE_BUILD b/26/overlay/tmp/NODE_BUILD index 12ce200..03513ea 100644 --- a/26/overlay/tmp/NODE_BUILD +++ b/26/overlay/tmp/NODE_BUILD @@ -1 +1 @@ -26.5.1-r0 \ No newline at end of file +26.12.1-r0 \ No newline at end of file diff --git a/26/overlay/tmp/NODE_MINOR b/26/overlay/tmp/NODE_MINOR index bb1930c..4054205 100644 --- a/26/overlay/tmp/NODE_MINOR +++ b/26/overlay/tmp/NODE_MINOR @@ -1 +1 @@ -26.5 \ No newline at end of file +26.12 \ No newline at end of file diff --git a/README.md b/README.md index 9649058..3708348 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Your app must listen on `0.0.0.0` (all interfaces), not `127.0.0.1` - otherwise ## Features -* 🟩 Node.js 16 to 26 - choose with the image tag +* 🟩 Node.js 20 to 26 - choose with the image tag * 📦 `npm` installed * 🧭 Your app runs under S6 supervision as `node` (UID 1000), not root * 🛑 The container stops if your app crashes, so Docker can restart it @@ -60,10 +60,6 @@ Images are published to Docker Hub (`bfren/node`) and Quay.io (`quay.io/bfren/no | 22 | 22.23.2 | 3.22 | 2027-04-30 (LTS) | | 21 | 21.7.3 | 3.20 | ended 2024-06-01 | | 20 | 20.15.1 | 3.20 | ended 2026-04-30 | -| 19 | 19.7.0 | 3.17 | ended 2023-06-01 | -| 18 | 18.20.1 | 3.18 | ended 2025-04-30 | -| 17 | 17.9.0 | 3.15 | ended 2022-06-01 | -| 16 | 16.20.2 | 3.16 | ended 2023-09-11 | Use an LTS version for anything long-lived - see the [Node.js release schedule](https://nodejs.org/en/about/previous-releases). Images for versions that have ended are still built, but get no Node.js fixes. diff --git a/VERSION b/VERSION index 88ea5ac..28cbf7c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.9 \ No newline at end of file +5.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index bf0d87a..7813681 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 8012ebb..6e63660 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -4.2 \ No newline at end of file +5.0 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 989c2ea..8090985 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,10 +4,10 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.7.2" +BASE_VERSION="6.7.3" echo "Base: ${BASE_VERSION}" -NODE_VERSIONS="16 17 18 19 20 21 22 23 24 26" +NODE_VERSIONS="20 21 22 23 24 26" for V in ${NODE_VERSIONS} ; do echo "Node.js ${V}" diff --git a/test.nu b/test.nu index 9bba8a2..de3cbae 100755 --- a/test.nu +++ b/test.nu @@ -3,10 +3,6 @@ use ../index/test.nu const node_branches = [ - "16" - "17" - "18" - "19" "20" "21" "22"