From 9b965ab44a9b06a7ed2b692c3ca2167741d437a3 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Mon, 30 Jun 2025 11:29:51 -0300 Subject: [PATCH 1/2] Add Node 24 | Remove Node 18 EOL | Tweak CI --- .github/workflows/ci-cd.yml | 4 ++-- {18 => 24}/Dockerfile | 2 +- {18 => 24}/entrypoint | 0 {18 => 24}/kool-npmrc | 0 {18 => 24}/root-npmrc | 0 README.md | 13 +++++++++---- fwd-template.json | 18 +++++++++--------- kool.yml | 6 ++---- 8 files changed, 23 insertions(+), 20 deletions(-) rename {18 => 24}/Dockerfile (97%) rename {18 => 24}/entrypoint (100%) rename {18 => 24}/kool-npmrc (100%) rename {18 => 24}/root-npmrc (100%) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index f7090d0..90808b4 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: version: [18, 20, 22, 22-nginx] - runs-on: [ubuntu-latest, buildjet-4vcpu-ubuntu-2204-arm] + runs-on: [ubuntu-24.04, ubuntu-24.04-arm] runs-on: ${{ matrix.runs-on }} steps: @@ -62,7 +62,7 @@ jobs: amend: if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node' needs: build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: version: [18, 20, 22] diff --git a/18/Dockerfile b/24/Dockerfile similarity index 97% rename from 18/Dockerfile rename to 24/Dockerfile index 1d0fbee..eecd806 100644 --- a/18/Dockerfile +++ b/24/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine +FROM node:24-alpine ENV ASUSER= \ UID=0 \ diff --git a/18/entrypoint b/24/entrypoint similarity index 100% rename from 18/entrypoint rename to 24/entrypoint diff --git a/18/kool-npmrc b/24/kool-npmrc similarity index 100% rename from 18/kool-npmrc rename to 24/kool-npmrc diff --git a/18/root-npmrc b/24/root-npmrc similarity index 100% rename from 18/root-npmrc rename to 24/root-npmrc diff --git a/README.md b/README.md index d9ff870..65ff3b6 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,6 @@ Minimal [Node](https://nodejs.org/en/) Docker image. It's use is intended for [k ## Available Tags -### 18 - -- [18](https://github.com/kool-dev/docker-node/blob/master/18/Dockerfile) - ### 20 - [20](https://github.com/kool-dev/docker-node/blob/master/20/Dockerfile) @@ -18,6 +14,14 @@ Minimal [Node](https://nodejs.org/en/) Docker image. It's use is intended for [k - [22](https://github.com/kool-dev/docker-node/blob/master/22/Dockerfile) +### 22-nginx + +- [22-nginx](https://github.com/kool-dev/docker-node/blob/master/22-nginx/Dockerfile) + +### 24 + +- [24](https://github.com/kool-dev/docker-node/blob/master/24/Dockerfile) + ### Legacy tags The following images have been discontinued, but still exist on Hub Docker in case you need them. We strongly advise moving to the newer versions. @@ -26,6 +30,7 @@ The following images have been discontinued, but still exist on Hub Docker in ca - [12](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12/Dockerfile), [12-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-qa/Dockerfile), [12-adonis](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-adonis/Dockerfile), [12-adonis-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-adonis-qa/Dockerfile), [12-nest](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-nest/Dockerfile), [12-nest-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/12-nest-qa/Dockerfile) - [14](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14/Dockerfile), [14-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-qa/Dockerfile), [14-adonis](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-adonis/Dockerfile), [14-adonis-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-adonis-qa/Dockerfile), [14-nest](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-nest/Dockerfile), [14-nest-qa](https://github.com/kool-dev/docker-node/tree/legacy-2022-07/14-nest-qa/Dockerfile) - [16](https://github.com/kool-dev/docker-node/blob/master/16/Dockerfile) +- [18](https://github.com/kool-dev/docker-node/blob/master/18/Dockerfile) - [21](https://github.com/kool-dev/docker-node/blob/master/21/Dockerfile) ## Environment Variables diff --git a/fwd-template.json b/fwd-template.json index 4b0cb73..98afa65 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -2,10 +2,10 @@ "output": ".", "builds": [ { - "name": "18", + "name": "20", "data": { - "from": "node:18-alpine", - "version": "18" + "from": "node:20-alpine", + "version": "20" }, "files": [ { @@ -27,10 +27,10 @@ ] }, { - "name": "20", + "name": "22", "data": { - "from": "node:20-alpine", - "version": "20" + "from": "node:22-alpine", + "version": "22" }, "files": [ { @@ -52,10 +52,10 @@ ] }, { - "name": "22", + "name": "24", "data": { - "from": "node:22-alpine", - "version": "22" + "from": "node:24-alpine", + "version": "24" }, "files": [ { diff --git a/kool.yml b/kool.yml index 5cc68cf..c733682 100644 --- a/kool.yml +++ b/kool.yml @@ -3,9 +3,7 @@ scripts: build: # parse templates - kool run template - # node 18 - - docker build --pull -t kooldev/node:18 18 - # node 20 - docker build --pull -t kooldev/node:20 20 - # node 22 - docker build --pull -t kooldev/node:22 22 + - docker build --pull -t kooldev/node:22-nginx 22-nginx + - docker build --pull -t kooldev/node:24 24 From 2a5a63edb45a528bfcd807bf73a21946e4c1d96f Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Mon, 30 Jun 2025 11:32:31 -0300 Subject: [PATCH 2/2] Tweaks --- .github/workflows/ci-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 90808b4..b7ed508 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - version: [18, 20, 22, 22-nginx] + version: [20, 22, 22-nginx, 24] runs-on: [ubuntu-24.04, ubuntu-24.04-arm] runs-on: ${{ matrix.runs-on }} @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - version: [18, 20, 22] + version: [20, 22, 22-nginx, 24] steps: - uses: docker/login-action@v3