From 6da02a9802659c9c329703e66546e611ea77a632 Mon Sep 17 00:00:00 2001 From: Agent Date: Tue, 14 Jul 2026 23:41:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=20-=20=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=20npm=20install=EF=BC=88Docker=E6=8E=A5?= =?UTF-8?q?=E7=AE=A1=EF=BC=89=20-=20=E7=AE=80=E5=8C=96Dockerfile=E4=B8=BA?= =?UTF-8?q?=E5=8D=95=E9=98=B6=E6=AE=B5=EF=BC=88=E5=8E=BB=E6=8E=89apt-get?= =?UTF-8?q?=E5=BC=80=E9=94=80=EF=BC=89=20-=20docker=20build=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0180s=E8=B6=85=E6=97=B6=E4=BF=9D=E6=8A=A4=20-=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4=E9=A2=84=E8=AE=A1=E4=BB=8E?= =?UTF-8?q?10=E5=88=86=E9=92=9F=E7=BC=A9=E7=9F=AD=E8=87=B32-3=E5=88=86?= =?UTF-8?q?=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/build.sh b/build.sh index 43ed6fa..0e511f1 100755 --- a/build.sh +++ b/build.sh @@ -10,6 +10,8 @@ CONTAINER_NAME="$SERVICE_NAME" HOST_PORT=9110 # 应用内部端口 APP_PORT=3000 +# 构建超时(秒) +BUILD_TIMEOUT=180 # 健康检查超时 HEALTH_WAIT=30 @@ -26,13 +28,9 @@ node --version npm --version # ===================== -# 安装依赖 & 前端构建 +# 构建前端 # ===================== -echo "2. 安装后端依赖..." -cd "$WORKSPACE/backend" -npm install --registry=https://registry.npmmirror.com - -echo "3. 安装前端依赖 & 构建..." +echo "2. 安装前端依赖 & 构建..." cd "$WORKSPACE/frontend" npm install --registry=https://registry.npmmirror.com npm run build @@ -46,43 +44,34 @@ echo "✅ 前端构建成功" # ===================== # 部署阶段 (Docker) # ===================== -echo "4. 开始部署..." +echo "3. 开始部署..." IMAGE_NAME="$SERVICE_NAME:latest" BACKUP_IMAGE="$SERVICE_NAME:last-good" cd "$WORKSPACE" -# 生成 Dockerfile(多阶段构建) -cat > Dockerfile <<'EOF' -# ---- 构建阶段 ---- -FROM node:22-slim AS builder -WORKDIR /build -COPY backend/package*.json ./ -RUN npm ci --only=production --registry=https://registry.npmmirror.com - -# ---- 运行阶段 ---- +# 生成 Dockerfile(单阶段构建,减少网络开销) +cat > Dockerfile <<'DOCKEREOF' FROM node:22-slim WORKDIR /app -RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends curl tzdata && \ - rm -rf /var/lib/apt/lists/* && \ - ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - -# 只复制需要的文件 -COPY --from=builder /build/node_modules ./node_modules +# 只复制依赖文件,利用 Docker 缓存 +COPY backend/package*.json ./ +RUN npm ci --only=production --registry=https://registry.npmmirror.com +# 复制源码和前端产物 COPY backend/src ./src COPY frontend/dist ./dist - EXPOSE 3000 ENV NODE_ENV=production ENV TZ=Asia/Shanghai -HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \ +HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \ CMD node -e "require('http').get('http://localhost:3000/api/health',r=>{process.exit(r.statusCode===200?0:1)}).on('error',()=>process.exit(1))" CMD ["node", "src/index.js"] -EOF +DOCKEREOF echo "构建 Docker 镜像: $IMAGE_NAME ..." -docker build -t "$IMAGE_NAME" . +# 限制构建时间 +timeout $BUILD_TIMEOUT docker build -t "$IMAGE_NAME" . # 备份旧版本镜像用于回滚 if docker ps -a | grep -q "$CONTAINER_NAME"; then @@ -144,4 +133,4 @@ else fi echo "请检查日志:docker logs $CONTAINER_NAME" -exit 1 +exit 1 \ No newline at end of file