From 34c2496704722ee24245fb305d8c8e361ff38c70 Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@yunhaixingtong.com>
Date: Thu, 10 Sep 2026 12:16:31 +0800
Subject: [PATCH] =?UTF-8?q?ci=E4=BF=AE=E8=AE=A2=EF=BC=9A=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=90=8D=E5=94=AF=E4=B8=80=E5=8C=96+deploy.y?=
 =?UTF-8?q?ml=E6=94=B9=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91=EF=BC=88?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20exit=20137=20=E4=BA=92=E6=9D=80=EF=BC=89-?=
 =?UTF-8?q?=E6=A0=B9=E5=9B=A0=E6=98=AF=20runner=20=E6=8C=82=E5=AE=BF?=
 =?UTF-8?q?=E4=B8=BB=20docker.sock=EF=BC=8C=E5=AE=B9=E5=99=A8=E5=90=8D?=
 =?UTF-8?q?=E5=9C=A8=E6=95=B4=E4=B8=AA=20daemon=20=E4=B8=8A=E6=98=AF?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=20build.yml=20=E4=B8=8E=E6=96=B0=E5=8A=A0=E7=9A=84=20?=
 =?UTF-8?q?deploy.yml=20=E9=83=BD=E5=86=99=E6=AD=BB=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=90=8D=20frontbuild=EF=BC=8C=E4=B8=A4=E6=9D=A1=E5=8F=88?=
 =?UTF-8?q?=E9=83=BD=E6=8C=82=20push=20=E8=A7=A6=E5=8F=91=EF=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E6=AC=A1=20push=20=E5=B9=B6=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=B8=A4=E4=B8=AA=20job=EF=BC=8C=E5=90=84=E8=87=AA?=
 =?UTF-8?q?=E7=9A=84=20docker=20rm=20-f=20frontbuild=20=E4=BC=9A=E6=8A=8A?=
 =?UTF-8?q?=E5=AF=B9=E6=96=B9=E6=AD=A3=E5=9C=A8=20npm=20ci/build=20?=
 =?UTF-8?q?=E7=9A=84=E5=AE=B9=E5=99=A8=E7=9B=B4=E6=8E=A5=20SIGKILL=20?=
 =?UTF-8?q?=E6=8E=89=EF=BC=8C=E8=A1=A8=E7=8E=B0=E4=B8=BA=E6=97=A0=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99=E7=9A=84=20exitcode=20137=EF=BC=882?=
 =?UTF-8?q?026-09-10=20=E4=B8=89=E4=BB=93=E5=90=8C=E6=8E=A8=E5=8D=B3?=
 =?UTF-8?q?=E6=92=9E=EF=BC=8CUserBase=20=E4=B8=A4=E6=9D=A1=20run=20?=
 =?UTF-8?q?=E4=B8=8E=20Cms=20run=20=E5=85=A8=E7=BA=A2=E3=80=81Notice=20?=
 =?UTF-8?q?=E4=BE=A5=E5=B9=B8=E7=BB=BF=EF=BC=89=EF=BC=9B=E6=94=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=A4=E6=9D=A1=20workflow=20=E5=86=85=20BUILD=5FCO?=
 =?UTF-8?q?NTAINER=3Dfrontbuild-${GITHUB=5FRUN=5FID}-${=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=B3}=20=E5=85=A8=E6=AD=A5=E5=BC=95=E7=94=A8=EF=BC=88run/e?=
 =?UTF-8?q?xec/cp/rm=20=E7=BB=9F=E4=B8=80=EF=BC=89=EF=BC=8CGITHUB=5FRUN=5F?=
 =?UTF-8?q?ID=20=E5=AE=9E=E4=BE=8B=E7=BA=A7=E5=94=AF=E4=B8=80=E3=80=81?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E5=85=9C=E5=BA=95=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E9=87=8D=E8=B7=91=E4=B8=8E=E6=9C=AA=E6=B3=A8=E5=85=A5=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=EF=BC=9B=E9=83=A8=E7=BD=B2=E9=80=9A=E9=81=93=E6=94=B6?=
 =?UTF-8?q?=E6=95=9B=EF=BC=9Apush=20=E8=87=AA=E5=8A=A8=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E5=BD=92=E4=B8=80=20build.yml=E2=86=92Nexus=E2=86=92projman=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=91=E5=B8=83=EF=BC=8Cdeploy.yml=20?=
 =?UTF-8?q?=E7=9A=84=20on=20=E5=8E=BB=E6=8E=89=20push=20=E5=8F=AA=E7=95=99?=
 =?UTF-8?q?=20workflow=5Fdispatch=EF=BC=88=E9=9C=80=E8=A6=81=E7=9B=B4?=
 =?UTF-8?q?=E8=BF=9E=E5=AE=BF=E4=B8=BB=20/data/www/userbase=20=E8=BD=AF?=
 =?UTF-8?q?=E9=93=BE=E7=A7=92=E7=BA=A7=E5=9B=9E=E6=BB=9A=E6=97=B6=E5=9C=A8?=
 =?UTF-8?q?=20Actions=20=E6=89=8B=E5=8A=A8=20Run=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=90=8C=E4=B8=80=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=A2=AB=E9=83=A8=E7=BD=B2=E4=B8=A4=E9=81=8D=EF=BC=9B=E5=9B=9B?=
 =?UTF-8?q?=E6=9D=A1=20workflow=20YAML=20=E8=A7=A3=E6=9E=90=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E3=80=81=E6=94=B9=E5=8A=A8=20step=20sh=20-n=20?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build.yml  | 20 +++++++++++++-------
 .gitea/workflows/deploy.yml | 23 +++++++++++++++--------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index ae9cc9a..a3f8cdc 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -38,10 +38,16 @@ jobs:
       - name: 构建前端（node 容器）
         run: |
           set -e
-          docker rm -f frontbuild 2>/dev/null || true
-          docker run -d --name frontbuild -w /build node:20 sleep 3600
-          docker cp "${PWD}/." frontbuild:/build/
-          docker exec frontbuild sh -c '
+          # 构建容器名必须全局唯一：runner 挂的是宿主 docker.sock，容器名在整个 daemon 上是共享
+          # 命名空间。旧写法固定名 frontbuild 会在多仓/多条 workflow 并发时互相 docker rm -f 掉
+          # 对方正在构建的容器，表现为无编译报错的 exit 137（SIGKILL，2026-09-10 三仓同推即撞）。
+          # GITHUB_RUN_ID 实例级唯一，再拼时间戳兜底（手动重跑/未注入时也不撞名）。
+          BUILD_CONTAINER="frontbuild-${GITHUB_RUN_ID:-0}-$(date +%s)"
+          echo "BUILD_CONTAINER=${BUILD_CONTAINER}"
+          docker rm -f "$BUILD_CONTAINER" 2>/dev/null || true
+          docker run -d --name "$BUILD_CONTAINER" -w /build node:20 sleep 3600
+          docker cp "${PWD}/." "$BUILD_CONTAINER":/build/
+          docker exec "$BUILD_CONTAINER" sh -c '
             set -e
             cd /build
             if [ -f .npmrc ]; then sed -i "/SASS_BINARY_PATH/d" .npmrc; fi
@@ -49,10 +55,10 @@ jobs:
             npm run build
           '
           echo "=== dist 产物 ==="
-          docker exec frontbuild sh -c 'ls -la /build/dist/ | head -20'
+          docker exec "$BUILD_CONTAINER" sh -c 'ls -la /build/dist/ | head -20'
           # 从容器 cp dist 到宿主工作目录
-          docker cp frontbuild:/build/dist ./dist
-          docker rm -f frontbuild
+          docker cp "$BUILD_CONTAINER":/build/dist ./dist
+          docker rm -f "$BUILD_CONTAINER"
           echo "BUILD CHECK OK"
 
       # 打包 dist → zip（进入 dist 目录打包，zip 根目录直接是 html/css/js 文件）
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index eb7a6e5..bb6ec9f 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,8 +10,9 @@ name: deploy-userbase-front
 # 依赖：160 宿主的 docker daemon（runner 已挂 docker.sock），且 runner valid_volumes 已放行 /data/www/**。无需 NEXUS secret。
 
 on:
-  push:
-    branches: [main]
+  # 仅手动触发（2026-09-10）：push 自动部署已归一到 build.yml -> Nexus -> projman「前端发布」通道。
+  # 两条都挂 push 时，同一仓库会并发起两个 job 抢同名构建容器，互相 docker rm -f 致 exit 137，
+  # 且同一次提交被部署两遍。需要直连宿主软链部署时，在 Actions 里手动 Run workflow 即可。
   workflow_dispatch:
 
 jobs:
@@ -40,16 +41,22 @@ jobs:
           VERSION="$(echo ${GITHUB_SHA} | cut -c1-7)-$(date +%Y%m%d-%H%M)"
           echo "Deploying version: $VERSION"
 
-          docker rm -f frontbuild 2>/dev/null || true
-          docker run -d --name frontbuild \
+          # 构建容器名必须全局唯一：runner 挂宿主 docker.sock，容器名在整个 daemon 上共享命名空间，
+          # 与 build.yml 的构建容器同名时会互相 docker rm -f 掉对方容器（exit 137 / SIGKILL）。
+          # GITHUB_RUN_ID 实例级唯一，再拼时间戳兜底（手动重跑或未注入时也不撞名）。
+          BUILD_CONTAINER="frontbuild-${GITHUB_RUN_ID:-0}-$(date +%s)"
+          echo "BUILD_CONTAINER=${BUILD_CONTAINER}"
+
+          docker rm -f "$BUILD_CONTAINER" 2>/dev/null || true
+          docker run -d --name "$BUILD_CONTAINER" \
             -e VERSION="$VERSION" \
             -v /data/www/userbase:/data/www/userbase \
             -w /build node:20 sleep 3600
 
           # 源码拷入构建容器（绕过 act 工作区非宿主路径的坑，与 service 的 mavenbuild 一致）
-          docker cp "${PWD}/." frontbuild:/build/
+          docker cp "${PWD}/." "$BUILD_CONTAINER":/build/
 
-          docker exec frontbuild sh -c '
+          docker exec "$BUILD_CONTAINER" sh -c '
             set -e
             cd /build
             # 去掉 Windows 专用 sass 二进制路径（Linux 容器内该路径无效，否则 build 报错）
@@ -60,7 +67,7 @@ jobs:
           '
 
           # 部署：首次把真实目录 front 迁入 releases/initial 并建软链；之后均为软链替换
-          docker exec frontbuild sh -c '
+          docker exec "$BUILD_CONTAINER" sh -c '
             set -e
             cd /build
             # ---- 首次初始化：front 当前是真实目录，无法直接 ln -sfn 覆盖 ----
@@ -84,5 +91,5 @@ jobs:
             echo "remaining versions:"; ls -1t
           '
 
-          docker rm -f frontbuild
+          docker rm -f "$BUILD_CONTAINER"
           echo "DEPLOY OK: $VERSION"