feat(node): refactor build

ggguardian · ggguardian · commit 7a48f300a57c · 2025-05-16T08:58:00.000+02:00
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -23,13 +23,11 @@ jobs:
   publish:
     strategy:
       matrix:
-        version: [latest, "22", "20", "20.10", "18", "18.20"]
+        version: [latest, "22.15", "20.19", "20.10"]
         variant: [prod, shell, dev]
     name: ${{ matrix.version }}${{ matrix.variant == 'shell' && '-shell' || matrix.variant == 'dev' && '-dev' || '' }}
     uses: './.github/workflows/release.yaml'
     with:
       tag: ${{ matrix.version }}${{ matrix.variant == 'shell' && '-shell' || matrix.variant == 'dev' && '-dev' || '' }}
-      target: ${{ matrix.variant }}
-      packages: >-
-        ${{ matrix.version != 'latest' && format('nodejs~{0}', matrix.version) || '' }}
+      target: ${{ format('{0}/{1}', matrix.version, matrix.variant) }}
     secrets: inherit
diff --git a/images/node/20.10/dev.yaml b/images/node/20.10/dev.yaml
@@ -0,0 +1,6 @@
+include: images/node/dev.yaml
+
+contents:
+  packages:
+    - nodejs~20.10
+    - npm~9
diff --git a/images/node/20.10/prod.yaml b/images/node/20.10/prod.yaml
@@ -0,0 +1,5 @@
+include: images/node/prod.yaml
+
+contents:
+  packages:
+    - nodejs~20.10
diff --git a/images/node/20.10/shell.yaml b/images/node/20.10/shell.yaml
@@ -0,0 +1,5 @@
+include: images/node/shell.yaml
+
+contents:
+  packages:
+    - nodejs~20.10
diff --git a/images/node/20.19/dev.yaml b/images/node/20.19/dev.yaml
@@ -0,0 +1,6 @@
+include: images/node/dev.yaml
+
+contents:
+  packages:
+    - nodejs~20.19
+    - npm~9
diff --git a/images/node/20.19/prod.yaml b/images/node/20.19/prod.yaml
@@ -0,0 +1,5 @@
+include: images/node/prod.yaml
+
+contents:
+  packages:
+    - nodejs~20.10
diff --git a/images/node/20.19/shell.yaml b/images/node/20.19/shell.yaml
@@ -0,0 +1,5 @@
+include: images/node/shell.yaml
+
+contents:
+  packages:
+    - nodejs~20.19
diff --git a/images/node/22.15/dev.yaml b/images/node/22.15/dev.yaml
@@ -0,0 +1,6 @@
+include: images/node/dev.yaml
+
+contents:
+  packages:
+    - nodejs~22.15
+    - npm~10
diff --git a/images/node/22.15/prod.yaml b/images/node/22.15/prod.yaml
@@ -0,0 +1,5 @@
+include: images/node/prod.yaml
+
+contents:
+  packages:
+    - nodejs~22.15
diff --git a/images/node/22.15/shell.yaml b/images/node/22.15/shell.yaml
@@ -0,0 +1,5 @@
+include: images/node/shell.yaml
+
+contents:
+  packages:
+    - nodejs~22.15
diff --git a/images/node/README.md b/images/node/README.md
@@ -9,21 +9,15 @@ Minimal Node image based on Wolfi.
 | latest       | ghcr.io/gitguardian/wolfi/node:latest       |
 | latest-shell | ghcr.io/gitguardian/wolfi/node:latest-shell |
 | latest-dev   | ghcr.io/gitguardian/wolfi/node:latest-dev   |
-| 22           | ghcr.io/gitguardian/wolfi/node:22           |
-| 22-shell     | ghcr.io/gitguardian/wolfi/node:22-shell     |
-| 22-dev       | ghcr.io/gitguardian/wolfi/node:22-dev       |
-| 20           | ghcr.io/gitguardian/wolfi/node:20           |
-| 20-shell     | ghcr.io/gitguardian/wolfi/node:20-shell     |
-| 20-dev       | ghcr.io/gitguardian/wolfi/node:20-dev       |
+| 22.15        | ghcr.io/gitguardian/wolfi/node:22.15        |
+| 22.15-shell  | ghcr.io/gitguardian/wolfi/node:22.15-shell  |
+| 22.15-dev    | ghcr.io/gitguardian/wolfi/node:22.15-dev    |
+| 20.19        | ghcr.io/gitguardian/wolfi/node:20.19        |
+| 20.19-shell  | ghcr.io/gitguardian/wolfi/node:20.19-shell  |
+| 20.19-dev    | ghcr.io/gitguardian/wolfi/node:20.19-dev    |
 | 20.10        | ghcr.io/gitguardian/wolfi/node:20.10        |
 | 20.10-shell  | ghcr.io/gitguardian/wolfi/node:20.10-shell  |
 | 20.10-dev    | ghcr.io/gitguardian/wolfi/node:20.10-dev    |
-| 18           | ghcr.io/gitguardian/wolfi/node:18           |
-| 18-shell     | ghcr.io/gitguardian/wolfi/node:18-shell     |
-| 18-dev       | ghcr.io/gitguardian/wolfi/node:18-dev       |
-| 18.20        | ghcr.io/gitguardian/wolfi/node:18.20        |
-| 18.20-shell  | ghcr.io/gitguardian/wolfi/node:18.20-shell  |
-| 18.20-dev    | ghcr.io/gitguardian/wolfi/node:18.20-dev    |
 
 ## ✅ Verify the Provenance
 
diff --git a/images/node/latest/dev.yaml b/images/node/latest/dev.yaml
@@ -0,0 +1 @@
+include: images/node/dev.yaml
diff --git a/images/node/latest/prod.yaml b/images/node/latest/prod.yaml
@@ -0,0 +1 @@
+include: images/node/prod.yaml
diff --git a/images/node/latest/shell.yaml b/images/node/latest/shell.yaml
@@ -0,0 +1 @@
+include: images/node/shell.yaml
