From 3e304c497e2da63ab2b10463e9e437d9cdb9e7ef Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 23 Jun 2026 22:36:58 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4pnpm=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8C=BA=E5=8C=85=E6=8E=92=E9=99=A4=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=92=8CDocker=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 更新pnpm-workspace.yaml,新增/调整需要排除的包目录 2. 交换certd-server中qiniu和mwtsc的依赖版本位置 3. 优化Docker构建命令,添加--production参数减少安装包体积,新增全局pnpm安装步骤 --- packages/ui/Dockerfile | 5 ++++- packages/ui/certd-server/package.json | 4 ++-- pnpm-workspace.yaml | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/ui/Dockerfile b/packages/ui/Dockerfile index 60c8ffde2..09cb7c277 100644 --- a/packages/ui/Dockerfile +++ b/packages/ui/Dockerfile @@ -12,7 +12,7 @@ COPY . /workspace/ RUN npm install -g pnpm@10.33.4 RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf -RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker +RUN cd /workspace/certd-server && pnpm install --production && npm run build-on-docker FROM base-${TARGETARCH}${TARGETVARIANT:+-}${TARGETVARIANT} @@ -72,6 +72,9 @@ ENV TZ=Asia/Shanghai ENV NODE_ENV=production ENV MIDWAY_SERVER_ENV=production +RUN npm install -g pnpm@10.33.4 + + COPY --from=builder /workspace/certd-server/ /app/ COPY ./patch/ssh2/*.js /app/node_modules/.pnpm/node_modules/ssh2/lib/protocol/ CMD ["node", "--optimize-for-size", "./bootstrap.js"] diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 2c893d0ee..0ca7bee5d 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -147,11 +147,11 @@ "@google-cloud/publicca": "^1.3.0", "basic-ftp": "^5.0.5", "esdk-obs-nodejs": "^3.25.6", - "qiniu": "^7.12.0" + "qiniu": "^7.12.0", + "mwtsc": "^1.15.1" }, "devDependencies": { "mwts": "^1.3.0", - "mwtsc": "^1.15.1", "@midwayjs/mock": "3.20.11", "@types/ali-oss": "^6.16.11", "@types/cache-manager": "^4.0.6", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b5cfae6d3..f888727ff 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,6 +2,11 @@ packages: - 'packages/**' # <--------------开发插件请注释掉这一行,PR时本修改不要提交 - 'packages/ui/**' - '!**/test/**' + - '!packages/libs/libs/lib-huawei' + - '!packages/libs/libs/lib-iframe' + - '!packages/libs/libs/lib-jdcloud' + # - '!packages/libs/libs/lib-k8s' # k8s引用了basic + - '!packages/libs/libs/midway-flyway-js' linkWorkspacePackages: deep preferWorkspacePackages: true \ No newline at end of file