diff --git a/infra/deploy/build.sh b/infra/deploy/build.sh index 0d76e43..7d9d35b 100755 --- a/infra/deploy/build.sh +++ b/infra/deploy/build.sh @@ -6,15 +6,21 @@ # 发布。改为独立构建仓 fetch+reset 硬跟 main:线上=远端 main,确定性闭环。 # blog 仓已公开,匿名 fetch 无需凭据。 set -e +# 抓取 URL:默认公网;同机构建可由宿主环境变量覆盖为内网 +# (2026-10-26 事故:ESA 边缘对 git.wait4x.online 522 时公网 fetch 失败, +# set -e 下静默死、staging 冻结——内网通道必须可用) +BLOG_GIT_URL="${BLOG_GIT_URL:-https://git.wait4x.online/wait4x/blog.git}" BUILD_REPO="$HOME/docker_apps/blog/build-repo" STAGING="$HOME/docker_apps/blog/www-staging" if [ ! -d "$BUILD_REPO/.git" ]; then echo "[build] 首次克隆构建仓" - git clone https://git.wait4x.online/wait4x/blog.git "$BUILD_REPO" + git clone "$BLOG_GIT_URL" "$BUILD_REPO" fi cd "$BUILD_REPO" +# 每次构建把 origin 指向配置的 URL(同机构建走内网通道;公网 522 时仍可发布) +git remote set-url origin "$BLOG_GIT_URL" git fetch origin main git reset --hard origin/main git clean -fd --exclude node_modules diff --git a/infra/deploy/webhook_receiver.py b/infra/deploy/webhook_receiver.py index 176f5ca..f718217 100644 --- a/infra/deploy/webhook_receiver.py +++ b/infra/deploy/webhook_receiver.py @@ -85,11 +85,15 @@ class Handler(BaseHTTPRequestHandler): def _run_build(self) -> None: with BUILD_LOCK: - subprocess.run( - ["bash", str(build_script())], - capture_output=True, timeout=1200, - cwd=str(BUILD_REPO), - ) + # 输出落盘:capture_output 丢弃是调试黑洞(2026-10-26 ESA 522 + # 事件中构建静默死、staging 冻结无任何可见痕迹) + log = Path.home() / "docker_apps/blog/build.log" + with open(log, "wb") as fh: + subprocess.run( + ["bash", str(build_script())], + stdout=fh, stderr=subprocess.STDOUT, timeout=1200, + cwd=str(BUILD_REPO), + ) def log_message(self, fmt: str, *args: object) -> None: # 静默常规访问日志(健康探针会刷屏);错误仍走默认 stderr