From a6b1263baae484ff7131e2ea7b429f22a1892698 Mon Sep 17 00:00:00 2001 From: John Lin Date: Thu, 22 Oct 2026 17:53:38 +0800 Subject: [PATCH] fix(node): complete supported Node.js security image matrix - Add Node.js 26.12.1 variants for every supported JDK version - Align the default base image and build examples with Node.js 22.23.4 - Refresh documented Node.js versions and supported image tags --- .github/workflows/build.yml | 4 +-- Dockerfile | 4 +-- README.md | 32 ++++++++++++------------ versions/versions.json | 50 +++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2edbf42..72b8ce1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: for REGISTRY in "${{ env.DOCKER_HUB_IMAGE }}" "${{ env.GHCR_IMAGE }}"; do # Primary tag: node22-jdk21 TAGS="${TAGS}${REGISTRY}:${NAME}," - # Version tag: node22.11.0-jdk21 + # Version tag: node22.23.4-jdk21 TAGS="${TAGS}${REGISTRY}:node${NODE_VERSION}-jdk${JDK_VERSION}," # Latest tag for node22-jdk21 @@ -206,7 +206,7 @@ jobs: ```bash docker build \ - --build-arg BASE_IMAGE_TAG=22.11.0-jdk21 \ + --build-arg BASE_IMAGE_TAG=22.23.4-jdk21 \ --build-arg GRADLE_VERSION=8.5 \ --build-arg SONAR_VERSION=4.8.0.2856 \ -t my-web-tools:node22-jdk21 . diff --git a/Dockerfile b/Dockerfile index 82c089f..e69ac9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ # # Build example: # docker build \ -# --build-arg BASE_IMAGE_TAG=22.11.0-jdk21 \ +# --build-arg BASE_IMAGE_TAG=22.23.4-jdk21 \ # --build-arg GRADLE_VERSION=8.5 \ # --build-arg SONAR_VERSION=4.8.0.2856 \ # -t ringcentral/web-tools:node22-jdk21 . -ARG BASE_IMAGE_TAG=22.11.0-jdk21 +ARG BASE_IMAGE_TAG=22.23.4-jdk21 FROM ghcr.io/ringcentral-docker/node:${BASE_IMAGE_TAG} diff --git a/README.md b/README.md index a2c604b..e398751 100644 --- a/README.md +++ b/README.md @@ -11,21 +11,21 @@ Multi-platform Docker images with Node.js, Java, Maven, Gradle, and development | Name | Node | JDK | Gradle | Docker Hub | GitHub Package | |------|------|-----|--------|------------|----------------| -| node20-jdk8 | 20.19.6 | 8 | 7.6 | `ringcentral/web-tools:node20-jdk8` | `ghcr.io/ringcentral-docker/web-tools:node20-jdk8` | -| node22-jdk8 | 22.21.1 | 8 | 7.6 | `ringcentral/web-tools:node22-jdk8` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk8` | -| node24-jdk8 | 24.12.0 | 8 | 7.6 | `ringcentral/web-tools:node24-jdk8` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk8` | -| node20-jdk11 | 20.19.6 | 11 | 7.6 | `ringcentral/web-tools:node20-jdk11` | `ghcr.io/ringcentral-docker/web-tools:node20-jdk11` | -| node22-jdk11 | 22.21.1 | 11 | 7.6 | `ringcentral/web-tools:node22-jdk11` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk11` | -| node24-jdk11 | 24.12.0 | 11 | 7.6 | `ringcentral/web-tools:node24-jdk11` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk11` | -| node20-jdk17 | 20.19.6 | 17 | 8.5 | `ringcentral/web-tools:node20-jdk17` | `ghcr.io/ringcentral-docker/web-tools:node20-jdk17` | -| node22-jdk17 | 22.21.1 | 17 | 8.5 | `ringcentral/web-tools:node22-jdk17` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk17` | -| node24-jdk17 | 24.12.0 | 17 | 8.5 | `ringcentral/web-tools:node24-jdk17` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk17` | -| node20-jdk21 | 20.19.6 | 21 | 8.5 | `ringcentral/web-tools:node20-jdk21` | `ghcr.io/ringcentral-docker/web-tools:node20-jdk21` | -| node22-jdk21 | 22.21.1 | 21 | 8.5 | `ringcentral/web-tools:node22-jdk21` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk21` | -| node24-jdk21 | 24.12.0 | 21 | 8.5 | `ringcentral/web-tools:node24-jdk21` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk21` | -| node20-jdk25 | 20.19.6 | 25 | 9.7.1 | `ringcentral/web-tools:node20-jdk25` | `ghcr.io/ringcentral-docker/web-tools:node20-jdk25` | -| node22-jdk25 | 22.21.1 | 25 | 9.7.1 | `ringcentral/web-tools:node22-jdk25` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk25` | -| node24-jdk25 | 24.12.0 | 25 | 9.7.1 | `ringcentral/web-tools:node24-jdk25` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk25` | +| node22-jdk8 | 22.23.4 | 8 | 7.6 | `ringcentral/web-tools:node22-jdk8` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk8` | +| node24-jdk8 | 24.22.1 | 8 | 7.6 | `ringcentral/web-tools:node24-jdk8` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk8` | +| node26-jdk8 | 26.12.1 | 8 | 7.6 | `ringcentral/web-tools:node26-jdk8` | `ghcr.io/ringcentral-docker/web-tools:node26-jdk8` | +| node22-jdk11 | 22.23.4 | 11 | 7.6 | `ringcentral/web-tools:node22-jdk11` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk11` | +| node24-jdk11 | 24.22.1 | 11 | 7.6 | `ringcentral/web-tools:node24-jdk11` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk11` | +| node26-jdk11 | 26.12.1 | 11 | 7.6 | `ringcentral/web-tools:node26-jdk11` | `ghcr.io/ringcentral-docker/web-tools:node26-jdk11` | +| node22-jdk17 | 22.23.4 | 17 | 8.5 | `ringcentral/web-tools:node22-jdk17` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk17` | +| node24-jdk17 | 24.22.1 | 17 | 8.5 | `ringcentral/web-tools:node24-jdk17` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk17` | +| node26-jdk17 | 26.12.1 | 17 | 8.5 | `ringcentral/web-tools:node26-jdk17` | `ghcr.io/ringcentral-docker/web-tools:node26-jdk17` | +| node22-jdk21 | 22.23.4 | 21 | 8.5 | `ringcentral/web-tools:node22-jdk21` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk21` | +| node24-jdk21 | 24.22.1 | 21 | 8.5 | `ringcentral/web-tools:node24-jdk21` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk21` | +| node26-jdk21 | 26.12.1 | 21 | 8.5 | `ringcentral/web-tools:node26-jdk21` | `ghcr.io/ringcentral-docker/web-tools:node26-jdk21` | +| node22-jdk25 | 22.23.4 | 25 | 9.7.1 | `ringcentral/web-tools:node22-jdk25` | `ghcr.io/ringcentral-docker/web-tools:node22-jdk25` | +| node24-jdk25 | 24.22.1 | 25 | 9.7.1 | `ringcentral/web-tools:node24-jdk25` | `ghcr.io/ringcentral-docker/web-tools:node24-jdk25` | +| node26-jdk25 | 26.12.1 | 25 | 9.7.1 | `ringcentral/web-tools:node26-jdk25` | `ghcr.io/ringcentral-docker/web-tools:node26-jdk25` | ## Included Tools @@ -54,7 +54,7 @@ docker run -it ringcentral/web-tools:node22-jdk21 bash ```bash docker build \ - --build-arg BASE_IMAGE_TAG=22.11.0-jdk21 \ + --build-arg BASE_IMAGE_TAG=22.23.4-jdk21 \ --build-arg GRADLE_VERSION=8.5 \ --build-arg SONAR_VERSION=4.8.0.2856 \ -t my-web-tools:node22-jdk21 . diff --git a/versions/versions.json b/versions/versions.json index 613a183..03c133d 100644 --- a/versions/versions.json +++ b/versions/versions.json @@ -20,6 +20,16 @@ "sonar_version": "4.8.0.2856", "is_latest": false }, + { + "name": "node26-jdk8", + "node_version": "26.12.1", + "node_major": "26", + "jdk_version": "8", + "base_image_tag": "26.12.1-jdk8", + "gradle_version": "7.6", + "sonar_version": "4.8.0.2856", + "is_latest": false + }, { "name": "node22-jdk11", "node_version": "22.23.4", @@ -40,6 +50,16 @@ "sonar_version": "4.8.0.2856", "is_latest": false }, + { + "name": "node26-jdk11", + "node_version": "26.12.1", + "node_major": "26", + "jdk_version": "11", + "base_image_tag": "26.12.1-jdk11", + "gradle_version": "7.6", + "sonar_version": "4.8.0.2856", + "is_latest": false + }, { "name": "node22-jdk17", "node_version": "22.23.4", @@ -60,6 +80,16 @@ "sonar_version": "6.2.1.4610", "is_latest": false }, + { + "name": "node26-jdk17", + "node_version": "26.12.1", + "node_major": "26", + "jdk_version": "17", + "base_image_tag": "26.12.1-jdk17", + "gradle_version": "8.5", + "sonar_version": "6.2.1.4610", + "is_latest": false + }, { "name": "node22-jdk21", "node_version": "22.23.4", @@ -80,6 +110,16 @@ "sonar_version": "6.2.1.4610", "is_latest": false }, + { + "name": "node26-jdk21", + "node_version": "26.12.1", + "node_major": "26", + "jdk_version": "21", + "base_image_tag": "26.12.1-jdk21", + "gradle_version": "8.5", + "sonar_version": "6.2.1.4610", + "is_latest": false + }, { "name": "node22-jdk25", "node_version": "22.23.4", @@ -99,6 +139,16 @@ "gradle_version": "9.7.1", "sonar_version": "6.2.1.4610", "is_latest": true + }, + { + "name": "node26-jdk25", + "node_version": "26.12.1", + "node_major": "26", + "jdk_version": "25", + "base_image_tag": "26.12.1-jdk25", + "gradle_version": "9.7.1", + "sonar_version": "6.2.1.4610", + "is_latest": false } ] }