Pass pnpm 11 dependency build policy into isolated Docker images
This commit is contained in:
@@ -8,6 +8,8 @@ RUN apt-get update \
|
||||
FROM base AS dependencies
|
||||
RUN corepack enable && corepack prepare pnpm@11.25.0 --activate
|
||||
COPY apps/wiki/package.json apps/wiki/pnpm-lock.yaml ./
|
||||
COPY pnpm-workspace.yaml /tmp/monorepo-policy.yaml
|
||||
RUN node -e "const fs=require('fs');const text=fs.readFileSync('/tmp/monorepo-policy.yaml','utf8');fs.writeFileSync('pnpm-workspace.yaml', text.slice(text.indexOf('allowBuilds:')));"
|
||||
RUN pnpm install --frozen-lockfile --fetch-timeout=300000 --network-concurrency=8
|
||||
|
||||
FROM dependencies AS build
|
||||
|
||||
@@ -2,6 +2,8 @@ FROM node:24-bookworm-slim AS build
|
||||
WORKDIR /app
|
||||
RUN corepack enable && corepack prepare pnpm@11.25.0 --activate
|
||||
COPY apps/studio/package.json apps/studio/pnpm-lock.yaml ./
|
||||
COPY pnpm-workspace.yaml /tmp/monorepo-policy.yaml
|
||||
RUN node -e "const fs=require('fs');const text=fs.readFileSync('/tmp/monorepo-policy.yaml','utf8');fs.writeFileSync('pnpm-workspace.yaml', text.slice(text.indexOf('allowBuilds:')));"
|
||||
RUN pnpm install --frozen-lockfile --fetch-timeout=300000 --network-concurrency=8
|
||||
COPY apps/studio/ .
|
||||
RUN pnpm typecheck && pnpm build
|
||||
|
||||
@@ -8,6 +8,8 @@ RUN apt-get update \
|
||||
FROM base AS dependencies
|
||||
RUN corepack enable && corepack prepare pnpm@11.25.0 --activate
|
||||
COPY apps/wiki/package.json apps/wiki/pnpm-lock.yaml ./
|
||||
COPY pnpm-workspace.yaml /tmp/monorepo-policy.yaml
|
||||
RUN node -e "const fs=require('fs');const text=fs.readFileSync('/tmp/monorepo-policy.yaml','utf8');fs.writeFileSync('pnpm-workspace.yaml', text.slice(text.indexOf('allowBuilds:')));"
|
||||
RUN pnpm install --frozen-lockfile --fetch-timeout=300000 --network-concurrency=8
|
||||
|
||||
FROM dependencies AS build
|
||||
|
||||
@@ -155,3 +155,5 @@
|
||||
后续校正:`.gitea/workflows/wiki.yml`、`studio.yml`、`python.yml` 将根目录部署脚本也精确归属到对应项目,防止修改 Studio/Python 部署脚本时错误运行 Wiki CI。
|
||||
|
||||
后续构建修复:`Dockerfile`、`apps/wiki/Dockerfile`、`apps/studio/Dockerfile` 将 pnpm 下载超时提高到 300 秒,并发限制为 8,处理服务器下载 Next.js / SWC 大文件超时的问题。
|
||||
|
||||
构建许可修复:`pnpm-workspace.yaml` 改用 pnpm 11 的 `allowBuilds`,明确允许 esbuild、sharp 安装脚本;`Dockerfile`、`apps/wiki/Dockerfile`、`apps/studio/Dockerfile` 在依赖安装层读取同一许可策略,解决独立镜像中缺失许可导致构建失败的问题。
|
||||
|
||||
+3
-3
@@ -3,6 +3,6 @@ packages:
|
||||
- apps/studio
|
||||
# Each application owns its lockfile, so releases stay independent.
|
||||
sharedWorkspaceLockfile: false
|
||||
onlyBuiltDependencies:
|
||||
- sharp
|
||||
- esbuild
|
||||
allowBuilds:
|
||||
sharp: true
|
||||
esbuild: true
|
||||
|
||||
Reference in New Issue
Block a user