diff --git a/.gitea/workflows/deploy-test.yml b/.gitea/workflows/deploy-test.yml index 5cbe877..4adac02 100644 --- a/.gitea/workflows/deploy-test.yml +++ b/.gitea/workflows/deploy-test.yml @@ -1,75 +1,115 @@ # ============================================================================= -# PERLER LAB 拼豆图纸库 —— Gitea Actions 测试环境流水线(test2) -# 触发:push 到 master 分支 -# 流程:构建前后端镜像 → 推送到 registry → SSH test2 部署 → 健康检查 +# PERLER LAB — Gitea Actions 测试环境自动部署 +# 触发:push 到 master(或手动 workflow_dispatch) +# 流程:checkout → 配置 SSH 密钥(Secret 注入) → 构建前后端镜像 +# → 推送到本地 registry(156.233.226.46:5000) +# → SSH 到测试机(156.233.226.86) compose 拉起 → 健康检查 +# 参考架构:homecentral deploy-test.yml # ============================================================================= -name: deploy-perler-lab-test +name: deploy-test on: push: branches: [master] workflow_dispatch: +concurrency: + group: deploy-test-master + cancel-in-progress: false + jobs: - build-and-deploy: + build-and-deploy-test: runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout master uses: actions/checkout@v4 + with: + ref: master - # runner 为 hostexecutor 模式(跑在 prod 宿主机 156.233.226.46), - # 直接构建并推送本地 registry 156.233.226.46:5000。 - - name: Build backend image + - name: Setup SSH key (from secrets) run: | - cd perler-lab-server - docker build -t perler-lab-server:latest . - docker tag perler-lab-server:latest 156.233.226.46:5000/perler-lab-server:latest - echo "后端镜像构建完成" + mkdir -p ~/.ssh + printf '%s\n' "${{ secrets.PERLER_DEPLOY_KEY }}" > ~/.ssh/id_ed25519_deploy + chmod 600 ~/.ssh/id_ed25519_deploy + ssh-keyscan -H ${{ secrets.PERLER_DEPLOY_HOST }} >> ~/.ssh/known_hosts 2>/dev/null + echo "SSH 密钥就绪" - - name: Build frontend image + - name: Build images run: | - cd perler-lab - docker build -t perler-lab-frontend:latest . - docker tag perler-lab-frontend:latest 156.233.226.46:5000/perler-lab-frontend:latest - echo "前端镜像构建完成" + set -e + docker build -t 156.233.226.46:5000/perler-lab-web:test ./perler-lab + docker build -t 156.233.226.46:5000/perler-lab-server:test ./perler-lab-server + docker images --format '{{.Repository}}:{{.Tag}} {{.Size}}' | grep perler-lab - - name: Push to registry + - name: Push to registry (156.233.226.46:5000) run: | - docker push 156.233.226.46:5000/perler-lab-server:latest - docker push 156.233.226.46:5000/perler-lab-frontend:latest - echo "镜像已推送到 registry" + set -e + docker push 156.233.226.46:5000/perler-lab-web:test + docker push 156.233.226.46:5000/perler-lab-server:test -# test1 = 171.80.10.85:47222,部署后端(8788) + 前端(8080) - # 后端连 test1 内网 PG(172.16.0.11:54322 perler_lab) - - name: Deploy to test1 + - name: Deploy to test env (156.233.226.86) run: | - ssh -o StrictHostKeyChecking=no -p 47222 root@171.80.10.85 " + set -e + HOST="${{ secrets.PERLER_DEPLOY_HOST }}" + SSH_CMD="ssh -i $HOME/.ssh/id_ed25519_deploy root@$HOST" + + # 生成测试环境专用 compose(镜像来自 registry,数据卷持久化 SQLite) + cat > /tmp/docker-compose.test.yml <<'COMPOSE_EOF' + services: + server: + image: 156.233.226.46:5000/perler-lab-server:test + container_name: perler-lab-server + restart: unless-stopped + environment: + PORT: "8788" + volumes: + - db-data:/app/data + networks: [perler-net] + frontend: + image: 156.233.226.46:5000/perler-lab-web:test + container_name: perler-lab-frontend + restart: unless-stopped + ports: + - "8080:80" + depends_on: + - server + networks: [perler-net] + networks: + perler-net: {} + volumes: + db-data: {} + COMPOSE_EOF + + $SSH_CMD 'mkdir -p /opt/perler-lab' + scp -i $HOME/.ssh/id_ed25519_deploy /tmp/docker-compose.test.yml root@$HOST:/opt/perler-lab/ + + $SSH_CMD ' set -e - docker pull 156.233.226.46:5000/perler-lab-server:latest - docker pull 156.233.226.46:5000/perler-lab-frontend:latest - docker network create perler-net 2>/dev/null || true - docker stop perler-lab-server perler-lab-frontend 2>/dev/null || true - docker rm perler-lab-server perler-lab-frontend 2>/dev/null || true - docker run -d --name perler-lab-server \ - --restart unless-stopped \ - --network perler-net \ - --network-alias server \ - -e PORT=8788 \ - -e DATABASE_URL='postgres://pgsql:XGYnJPysCNJsLeea@172.16.0.11:54322/perler_lab' \ - -p 8788:8788 \ - 156.233.226.46:5000/perler-lab-server:latest - docker run -d --name perler-lab-frontend \ - --restart unless-stopped \ - --network perler-net \ - -p 8080:80 \ - 156.233.226.46:5000/perler-lab-frontend:latest - echo '容器已启动,等待健康检查...' - sleep 12 - echo '--- 后端健康检查 ---' - curl -sf http://localhost:8788/health && echo '后端 OK' || echo '后端未就绪' - echo '--- 前端健康检查 ---' - curl -s -o /dev/null -w '前端 HTTP %{http_code}\n' http://localhost:8080/ || echo '前端未就绪' - echo '? test1 部署完成' - " - continue-on-error: true -# 触发测试 - 真实变更 + cd /opt/perler-lab + echo "===== 拉取镜像 =====" + docker compose -f docker-compose.test.yml pull + echo "===== 拉起容器 =====" + docker compose -f docker-compose.test.yml up -d --remove-orphans + + echo "===== 等待前端健康 (/healthz) =====" + OK=0 + for i in $(seq 1 24); do + if curl -sf http://127.0.0.1:8080/healthz >/dev/null 2>&1; then OK=1; break; fi + sleep 5 + done + if [ "$OK" != "1" ]; then + echo "前端健康检查失败"; docker ps -a | grep perler; exit 1 + fi + echo "前端 OK" + + echo "===== 后端健康 (/health 经容器内自检) =====" + docker exec perler-lab-server node -e "fetch(\"http://localhost:8788/health\").then(r=>{console.log(\"server /health ->\",r.status);process.exit(r.ok?0:1)}).catch(()=>process.exit(1))" + + curl -s -o /dev/null -w "首页 HTTP %{http_code}\n" http://127.0.0.1:8080/ + echo "===== 测试环境部署完成 =====" + ' + + - name: Deployment summary + if: always() + run: | + echo "测试环境访问: http://156.233.226.86:8080" diff --git a/.gitea/workflows/probe.yml b/.gitea/workflows/probe.yml deleted file mode 100644 index c6aba4c..0000000 --- a/.gitea/workflows/probe.yml +++ /dev/null @@ -1,22 +0,0 @@ -# 探针:确认 Gitea Actions job 容器内的工具可用性(验证后可删除) -name: probe-runner - -on: - push: - branches: [master] - workflow_dispatch: - -jobs: - probe: - runs-on: ubuntu-latest - steps: - - name: Probe tools - run: | - echo "=== docker client/server ===" - docker version --format 'client={{.Client.Version}} server={{.Server.Version}}' 2>&1 | head -3 - echo "=== docker socket ===" - ls -la /var/run/docker.sock 2>&1 || true - echo "=== ssh / scp / rsync ===" - which ssh scp rsync 2>&1 || true - echo "=== whoami/home ===" - whoami; echo HOME=$HOME