From 9b10652a28622bd701e7b9386df743195e538600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 14 Aug 2026 10:15:51 +0000
Subject: [PATCH] ci: Build `node-pc` runtime on `n8nio/base` image (#36284)

---
 .github/workflows/build-node-pc-image.yml |  8 -----
 docker/images/node-pc/Dockerfile          | 37 +++--------------------
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/build-node-pc-image.yml b/.github/workflows/build-node-pc-image.yml
index 06521badfce..139105d6d46 100644
--- a/.github/workflows/build-node-pc-image.yml
+++ b/.github/workflows/build-node-pc-image.yml
@@ -44,14 +44,6 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - name: Login to DHI Registry (for pulling the runtime base)
-        uses: ./.github/actions/docker-registry-login
-        with:
-          login-ghcr: 'false'
-          login-dhi: 'true'
-          dockerhub-username: ${{ secrets.DOCKER_USERNAME }}
-          dockerhub-password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Login to Docker registries (for pushing)
         if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.push == true)
         uses: ./.github/actions/docker-registry-login
diff --git a/docker/images/node-pc/Dockerfile b/docker/images/node-pc/Dockerfile
index ebf3e6cf3aa..b829a3fa9f7 100644
--- a/docker/images/node-pc/Dockerfile
+++ b/docker/images/node-pc/Dockerfile
@@ -6,8 +6,7 @@
 # docker-node Alpine recipe with one added configure flag.
 #
 # Two published targets:
-#   runtime (default) - drop-in sibling of n8nio/base, layered on the same DHI
-#                       base with our compiled Node swapped in
+#   runtime (default) - n8nio/base with our compiled Node swapped in
 #   dev               - plain Alpine with apk usable, for the n8n builder
 #                       stage, which must compile native addons against this
 #                       Node's headers
@@ -87,44 +86,18 @@ ENV npm_config_nodedir=/usr/local
 
 # ---------------------------------------------------------------------------
 
-# Runtime layers on the same DHI base as n8n-base, so both siblings share
-# Docker's OS-layer patching and attestations. Only the Node binary is ours:
-# DHI's stock Node (at /usr/bin on Alpine) is removed and replaced by the
-# pointer-compressed build.
+# `n8nio/base:26.x` with one change, namely the stock Node files (node, npm,
+# npx, corepack) are swapped for the pointer-compressed build's files.
 # Pinned to a multi-arch index digest (linux/amd64 + linux/arm64) for reproducible builds.
 # Bump the tag and digest together when updating.
-FROM dhi.io/node:26.5.1-alpine3.24-dev@sha256:c4062f85acd1ca91ffb7d15048dcc5f15a922d630e65eb3c3c0dcdcef6ea36d8 AS runtime
+FROM n8nio/base:26.5.1@sha256:1b0bca5c94bbd04ad2120b9e9892a8bc717a1d88efa76fefe452c59bdc611d25 AS runtime
 
-RUN rm -f /usr/bin/node /usr/bin/nodejs /usr/bin/npm /usr/bin/npx /usr/bin/corepack
+RUN rm -f /usr/bin/node /usr/bin/nodejs /usr/bin/npm /usr/bin/npx /usr/bin/corepack /usr/local/bin/node
 COPY --from=builder /node-install/usr/local /usr/local
 RUN node --version \
     && node -e "if (!process.config.variables.v8_enable_pointer_compression) { throw new Error('pointer compression is not enabled') }"
 
-# Mirrors docker/images/n8n-base/Dockerfile so the n8n runtime stage can swap
-# between the two.
-RUN apk add --no-cache busybox-binsh && \
-    apk --no-cache add --virtual .build-deps-fonts msttcorefonts-installer fontconfig && \
-    update-ms-fonts && \
-    fc-cache -f && \
-    apk del .build-deps-fonts && \
-    find /usr/share/fonts/truetype/msttcorefonts/ -type l -exec unlink {} \; && \
-    # No blanket `apk upgrade` — patched bytes come from bumping the pinned
-    # DHI digest instead, same policy as n8n-base.
-    apk add --no-cache \
-        openssh \
-        graphicsmagick \
-        tini \
-        tzdata \
-        ca-certificates \
-        libc6-compat && \
-    rm -rf /tmp/* /root/.npm /root/.cache/node /opt/yarn* && \
-    apk del apk-tools
-
 # The compiled build lives at /usr/local/bin, which is what the cloud launch
 # and AppArmor profile expect. Keep the stock /usr/bin path working for
 # anything that references it.
 RUN ln -sf /usr/local/bin/node /usr/bin/node
-
-WORKDIR /home/node
-ENV NODE_PATH=/usr/local/lib/node_modules
-EXPOSE 5678/tcp