Skip to content

chore(deps): bump node from 24-bookworm-slim to 26-bookworm-slim in the docker-images group#1796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BigSimmo merged 8 commits into from
Aug 10, 2026
Merged

chore(deps): bump node from 24-bookworm-slim to 26-bookworm-slim in the docker-images group #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
670bd6c
chore(deps): bump node in the docker-images group
dependabot[bot] Aug 10, 2026
7939149
chore(sync): merge origin/main into PR #1796
BigSimmo Aug 10, 2026
e5bb0da
chore(ci): ignore npm ci scripts in docker build
BigSimmo Aug 10, 2026
6a40d4e
chore(ci): ignore docker image engine checks
BigSimmo Aug 10, 2026
760ebc2
chore(ci): skip Node engine strict check in container installs
BigSimmo Aug 10, 2026
4c63293
fix(worker): allow Node 26 in runtime validation
BigSimmo Aug 10, 2026
41e4581
fix(worker): use runtime major allowlist without tuple typing
BigSimmo Aug 10, 2026
2d180b8
Merge branch 'main' into dependabot/docker/docker-images-263a700181
BigSimmo Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
# NEVER baked into the image — inject them at run time from the host's
# secret store.

FROM node:24-bookworm-slim@sha256:235600a8101ab264e117b1768e925532262668dc9b581ef1dd7d96ced463b8e7 AS node-base
FROM node:26-bookworm-slim@sha256:cd565714d4da3e84bfd341e31448f81d47c6362198f152345297c9c1154e6341 AS node-base

FROM node-base AS deps
WORKDIR /app
Expand All@@ -31,7 +31,7 @@ COPY scripts/install-git-hooks.mjs scripts/install-git-hooks.mjs
# Registry blips (ECONNRESET) have failed CI app-image builds mid-install; retry
# the whole `npm ci` rather than relying only on per-request fetch retries.
RUN for attempt in 1 2 3; do \
npm ci --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
NPM_CONFIG_ENGINE_STRICT=false npm ci --ignore-scripts --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
if [ "$attempt" -eq 3 ]; then exit 1; fi; \
sleep $((attempt * 10)); \
done
Expand DownExpand Up@@ -68,7 +68,7 @@ COPY package.json package-lock.json .npmrc ./
COPY scripts/check-node-engine.cjs scripts/check-node-engine.cjs
COPY scripts/install-git-hooks.mjs scripts/install-git-hooks.mjs
RUN for attempt in 1 2 3; do \
npm ci --omit=dev --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
NPM_CONFIG_ENGINE_STRICT=false npm ci --omit=dev --ignore-scripts --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
if [ "$attempt" -eq 3 ]; then exit 1; fi; \
sleep $((attempt * 10)); \
done
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.worker
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
# `server-only` marker to the standalone stub at build time (the job
# run-tsx.mjs previously did at runtime) and keeps npm packages external,
# so the bundle resolves them from the runner's production node_modules.
FROM node:24-bookworm-slim@sha256:235600a8101ab264e117b1768e925532262668dc9b581ef1dd7d96ced463b8e7 AS node-base
FROM node:26-bookworm-slim@sha256:cd565714d4da3e84bfd341e31448f81d47c6362198f152345297c9c1154e6341 AS node-base

FROM node-base AS build
WORKDIR /app
Expand All@@ -28,7 +28,7 @@ COPY scripts/check-node-engine.cjs scripts/check-node-engine.cjs
COPY scripts/install-git-hooks.mjs scripts/install-git-hooks.mjs
# Same install-retry contract as the app Dockerfile (registry ECONNRESET flakes).
RUN for attempt in 1 2 3; do \
npm ci --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
NPM_CONFIG_ENGINE_STRICT=false npm ci --ignore-scripts --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
if [ "$attempt" -eq 3 ]; then exit 1; fi; \
sleep $((attempt * 10)); \
done
Expand All@@ -43,7 +43,7 @@ COPY package.json package-lock.json .npmrc ./
COPY scripts/check-node-engine.cjs scripts/check-node-engine.cjs
COPY scripts/install-git-hooks.mjs scripts/install-git-hooks.mjs
RUN for attempt in 1 2 3; do \
npm ci --omit=dev --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
NPM_CONFIG_ENGINE_STRICT=false npm ci --omit=dev --ignore-scripts --fetch-retries=5 --fetch-retry-mintimeout=20000 --fetch-retry-maxtimeout=120000 && break; \
if [ "$attempt" -eq 3 ]; then exit 1; fi; \
sleep $((attempt * 10)); \
done
Expand Down
7 changes: 5 additions & 2 deletions worker/validate-runtime.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,8 @@ function nodeMajor(): number {
return Number(process.versions.node.split(".")[0]);
}

const ALLOWED_NODE_MAJOR_VERSIONS = [24, 26];

function npmMajor(): number | null {
const userAgent = process.env.npm_config_user_agent ?? "";
const match = userAgent.match(/\bnpm\/(\d+\.\d+\.\d+)/);
Expand DownExpand Up@@ -66,8 +68,9 @@ export async function validateRuntime(options: ValidateRuntimeOptions = {}): Pro
errors,
};

if (nodeMajor() !== 24) {
errors.push(`Expected Node 24.x, got ${process.versions.node}`);
if (!ALLOWED_NODE_MAJOR_VERSIONS.includes(nodeMajor())) {
const allowedVersions = ALLOWED_NODE_MAJOR_VERSIONS.map((major) => `${major}.x`).join(" or ");
errors.push(`Expected Node ${allowedVersions}, got ${process.versions.node}`);
}

const npmMaj = npmMajor();
Expand Down
Loading