n8n-io/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-10-12 02:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix Docker build chain after DHI base drift and the pnpm 11 upgrade (#36984)

Browse Source 
Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
This commit is contained in:
Matsu
2026-08-25 10:43:20 +03:00
committed by GitHub
co-authored by Claude Opus 5
parent d62dc26549
commit d248db1cac
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-base-image.yml
+5 -5
View File
@@ -32,11 +32,11 @@ jobs:
# when updating.
include:
- node_version: '22'
dhi_ref: dhi.io/node:22.23.2-alpine3.24-dev@sha256:a6ac21cfbc4bb746c1cfc6cf1501ec13c961ae71558ff2ac7e021caaaf91a224
- node_version: '24.18.1'
dhi_ref: dhi.io/node:24.18.1-alpine3.24-dev@sha256:074b5aa92e1ce74cd575214211bbcb8d1550710aec59558da734a67d84d31679
- node_version: '26.5.1'
dhi_ref: dhi.io/node:26.5.1-alpine3.24-dev@sha256:c4062f85acd1ca91ffb7d15048dcc5f15a922d630e65eb3c3c0dcdcef6ea36d8
dhi_ref: dhi.io/node:22.23.2-alpine3.24-dev@sha256:155a95d59244a71e9479e191ff718f03a7197d6829612e0707608be92988cb87
- node_version: '24.19.0'
dhi_ref: dhi.io/node:24.19.0-alpine3.24-dev@sha256:dc2989ad23938772abaf549ed7bde5d61d70377005229bb55bef94bff40f8bbd
- node_version: '26.7.0'
dhi_ref: dhi.io/node:26.7.0-alpine3.24-dev@sha256:4b494d89fb26c950ce97865acf45b480dc7a6868fdc2b81c2d66599702eeac3f
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
docker/images/n8n-base/Dockerfile
+1 -1
View File
@@ -1,6 +1,6 @@
# CI passes one DHI reference per published Node version (see the matrix in
# build-base-image.yml). The default keeps plain `docker build` working.
ARG DHI_REF=dhi.io/node:24.18.1-alpine3.24-dev@sha256:074b5aa92e1ce74cd575214211bbcb8d1550710aec59558da734a67d84d31679
ARG DHI_REF=dhi.io/node:24.19.0-alpine3.24-dev@sha256:dc2989ad23938772abaf549ed7bde5d61d70377005229bb55bef94bff40f8bbd
FROM ${DHI_REF}
# Install all dependencies in a single layer to minimize image size
pnpm-workspace.yaml
+4
View File
@@ -12,6 +12,10 @@ hoistPattern:
- '*'
- '!typescript'
allowUnusedPatches: true
# The docker build trims frontend manifests and deploys with --prod before later
# scripts run; pnpm 11's pre-run install would reinstall production-only and prune
# the devDependencies those scripts import.
verifyDepsBeforeRun: false
pmOnFail: warn
fund: false
scripts/build-n8n.mjs
+14 -17
View File
@@ -10,6 +10,7 @@
import { $, echo, fs, chalk } from 'zx';
import path from 'path';
import os from 'os';
// Check if running in a CI environment
const isCI = process.env.CI === 'true';
@@ -123,14 +124,13 @@ const packageJsonFiles = await $`cd ${config.rootDir} && find . -name "package.j
-not -path "./compiled/*" \
-type f`.lines();
// Backup all package.json files
// This is only needed locally, not in CI
if (process.env.CI !== 'true') {
for (const file of packageJsonFiles) {
if (file) {
const fullPath = path.join(config.rootDir, file);
await fs.copy(fullPath, `${fullPath}.bak`);
}
// Backup all package.json files. The FE trim below mutates them, and pnpm verifies
// the lockfile before running any later script, which fails until they are restored.
// Backups live outside the workspace: siblings would be packed into the deployment.
const packageJsonBackupDir = await fs.mkdtemp(path.join(os.tmpdir(), 'n8n-build-pkgjson-'));
for (const file of packageJsonFiles) {
if (file) {
await fs.copy(path.join(config.rootDir, file), path.join(packageJsonBackupDir, file));
}
}
// Run FE trim script
@@ -303,18 +303,15 @@ if (generateLicenses) {
}
// Restore package.json files
// This is only needed locally, not in CI
if (process.env.CI !== 'true') {
for (const file of packageJsonFiles) {
if (file) {
const fullPath = path.join(config.rootDir, file);
const backupPath = `${fullPath}.bak`;
if (await fs.pathExists(backupPath)) {
await fs.move(backupPath, fullPath, { overwrite: true });
}
for (const file of packageJsonFiles) {
if (file) {
const backupPath = path.join(packageJsonBackupDir, file);
if (await fs.pathExists(backupPath)) {
await fs.move(backupPath, path.join(config.rootDir, file), { overwrite: true });
}
}
}
await fs.remove(packageJsonBackupDir);
// Calculate output size
const compiledAppOutputSize = (await $`du -sh ${config.compiledAppDir} | cut -f1`).stdout.trim();