aibo/BoosAPI
1
0
Fork 0
forked from boos/BoosAPI
Code Pull Requests Activity

fix: restore armv7 docker base image (#337)

Browse Source
This commit is contained in:
Cita
2026-03-30 23:23:55 +08:00
committed by GitHub
parent eb65a2be88
commit 618ca0b9bf
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile
+4 -2
View File
@@ -1,5 +1,7 @@
# syntax=docker/dockerfile:1.7 # syntax=docker/dockerfile:1.7
FROM node:25-bookworm-slim AS builder # Keep the Docker base on Node 22 because the official Node 24/25 slim images
# no longer publish linux/arm/v7 manifests, which breaks our armv7 Docker jobs.
FROM node:22-bookworm-slim AS builder
WORKDIR /app WORKDIR /app
@@ -17,7 +19,7 @@ COPY . .
RUN npm run build:web && npm run build:server RUN npm run build:web && npm run build:server
RUN --mount=type=cache,target=/root/.npm npm prune --omit=dev --no-audit --no-fund RUN --mount=type=cache,target=/root/.npm npm prune --omit=dev --no-audit --no-fund
FROM node:25-bookworm-slim FROM node:22-bookworm-slim
WORKDIR /app WORKDIR /app
scripts/dev/docker.workflow.test.ts
+2 -4
View File
@@ -19,10 +19,8 @@ describe('docker workflows', () => {
it('uses an armv7-capable node base image in the Dockerfile', () => { it('uses an armv7-capable node base image in the Dockerfile', () => {
const dockerfile = readFileSync(resolve(process.cwd(), 'docker/Dockerfile'), 'utf8'); const dockerfile = readFileSync(resolve(process.cwd(), 'docker/Dockerfile'), 'utf8');
const fromMatches = [...dockerfile.matchAll(/^FROM node:(\d+)-bookworm-slim(?: AS builder)?$/gm)]; expect(dockerfile).toContain('FROM node:22-bookworm-slim AS builder');
expect(dockerfile).toContain('FROM node:22-bookworm-slim');
expect(fromMatches).toHaveLength(2);
expect(fromMatches[0]?.[1]).toBe(fromMatches[1]?.[1]);
}); });
it('keeps server docker builds isolated from desktop packaging dependencies', () => { it('keeps server docker builds isolated from desktop packaging dependencies', () => {