fix(deploy): build from clean release checkout

Author: ieduer

.github/workflows/deploy.yml

@@ -14,7 +14,8 @@ jobs:
           username: root
           key: ${{ secrets.VPS_SSH_KEY }}
           script: |
-            cd /root/cross-subject-knowledge
-            git pull origin main
+            RELEASE_ROOT="$(mktemp -d /tmp/csk-release.XXXXXX)"
+            git clone --depth 1 --branch main https://github.com/ieduer/cross-subject-knowledge.git "$RELEASE_ROOT"
+            cd "$RELEASE_ROOT"
             chmod +x scripts/deploy_vps.sh
-            ./scripts/deploy_vps.sh
+            RUNTIME_ROOT=/root/cross-subject-knowledge ./scripts/deploy_vps.sh

README.md

@@ -290,7 +290,7 @@ docker run -d --name textbook-knowledge \
 项目利用 GitHub Actions 实现了完全自动化的持续部署：
 1.  开发者在本地修改代码后，`git push` 到 GitHub `main` 分支。
 2.  GitHub Actions 自动触发，SSH 连入生产服务器 (VPS: `sun.bdfz.net`)。
-3.  在 VPS 上执行 `git pull` 拉取最新代码。
+3.  在 VPS 上创建临时的干净 release checkout，避免生产目录里历史热补丁或临时改动阻塞发布。
 4.  在 VPS 上先构建新镜像，再停旧容器，避免“构建失败直接打挂线上”。
 5.  新容器通过 `/api/health` 健康检查后才算部署成功；失败则自动回滚到上一镜像。
 6.  运行时模型缓存保存在宿主机 `state/cache/`，避免每次发版都把 Hugging Face 缓存烘进镜像。

scripts/deploy_vps.sh

@@ -1,28 +1,29 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-APP_ROOT="/root/cross-subject-knowledge"
+SOURCE_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+RUNTIME_ROOT="${RUNTIME_ROOT:-/root/cross-subject-knowledge}"
 CONTAINER_NAME="textbook-knowledge"
 REPO_NAME="textbook-knowledge"
 EMBEDDER_NAME="${EMBEDDER_NAME:-BAAI/bge-m3}"
 
-cd "$APP_ROOT"
+cd "$SOURCE_ROOT"
 
 mkdir -p \
-  data/index \
-  state/logs \
-  state/cache/huggingface \
-  state/cache/sentence_transformers \
-  state/tmp \
-  state/batch
-
-if [ ! -f data/index/textbook_mineru_fts.db ]; then
-  echo "ERROR: missing runtime DB data/index/textbook_mineru_fts.db"
+  "${RUNTIME_ROOT}/data/index" \
+  "${RUNTIME_ROOT}/state/logs" \
+  "${RUNTIME_ROOT}/state/cache/huggingface" \
+  "${RUNTIME_ROOT}/state/cache/sentence_transformers" \
+  "${RUNTIME_ROOT}/state/tmp" \
+  "${RUNTIME_ROOT}/state/batch"
+
+if [ ! -f "${RUNTIME_ROOT}/data/index/textbook_mineru_fts.db" ]; then
+  echo "ERROR: missing runtime DB ${RUNTIME_ROOT}/data/index/textbook_mineru_fts.db"
   exit 1
 fi
 
-if [ ! -f data/index/textbook_chunks.index ]; then
-  echo "ERROR: missing runtime FAISS index data/index/textbook_chunks.index"
+if [ ! -f "${RUNTIME_ROOT}/data/index/textbook_chunks.index" ]; then
+  echo "ERROR: missing runtime FAISS index ${RUNTIME_ROOT}/data/index/textbook_chunks.index"
   exit 1
 fi
 
@@ -33,7 +34,7 @@ backup_tag="${REPO_NAME}:pre-${build_stamp}"
 rollback_image=""
 
 host_cache_has_model() {
-  find "${APP_ROOT}/state/cache/huggingface" -type f | grep -q .
+  find "${RUNTIME_ROOT}/state/cache/huggingface" -type f | grep -q .
 }
 
 echo "=== deploy start $(date -u '+%Y-%m-%d %H:%M:%S UTC') commit=${commit_sha} ==="
@@ -53,7 +54,7 @@ docker build --pull -t "${build_tag}" -t "${REPO_NAME}:latest" .
 if ! host_cache_has_model; then
   echo "=== bootstrapping host model cache ==="
   if docker ps -a --format '{{.Names}}' | grep -qx "${CONTAINER_NAME}"; then
-    docker cp "${CONTAINER_NAME}:/root/.cache/huggingface/." "${APP_ROOT}/state/cache/huggingface/" >/dev/null 2>&1 || true
+    docker cp "${CONTAINER_NAME}:/root/.cache/huggingface/." "${RUNTIME_ROOT}/state/cache/huggingface/" >/dev/null 2>&1 || true
   fi
 fi
 
@@ -63,7 +64,7 @@ if ! host_cache_has_model; then
     -e HF_HOME=/state/cache/huggingface \
     -e SENTENCE_TRANSFORMERS_HOME=/state/cache/sentence_transformers \
     -e TRANSFORMERS_CACHE=/state/cache/huggingface/transformers \
-    -v "${APP_ROOT}/state:/state" \
+    -v "${RUNTIME_ROOT}/state:/state" \
     "${build_tag}" \
     python -c "from sentence_transformers import SentenceTransformer; SentenceTransformer('${EMBEDDER_NAME}')"
 fi
@@ -81,8 +82,8 @@ docker run -d \
   -e HF_HOME=/state/cache/huggingface \
   -e SENTENCE_TRANSFORMERS_HOME=/state/cache/sentence_transformers \
   -e TRANSFORMERS_CACHE=/state/cache/huggingface/transformers \
-  -v "${APP_ROOT}/data:/data" \
-  -v "${APP_ROOT}/state:/state" \
+  -v "${RUNTIME_ROOT}/data:/data" \
+  -v "${RUNTIME_ROOT}/state:/state" \
   "${build_tag}" >/dev/null
 
 healthy="false"
@@ -114,8 +115,8 @@ if [ "${healthy}" != "true" ]; then
       -e HF_HOME=/state/cache/huggingface \
       -e SENTENCE_TRANSFORMERS_HOME=/state/cache/sentence_transformers \
       -e TRANSFORMERS_CACHE=/state/cache/huggingface/transformers \
-      -v "${APP_ROOT}/data:/data" \
-      -v "${APP_ROOT}/state:/state" \
+      -v "${RUNTIME_ROOT}/data:/data" \
+      -v "${RUNTIME_ROOT}/state:/state" \
       "${rollback_image}" >/dev/null
   fi
   exit 1