xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 16 Pull Requests 12 Actions 34.2k Packages Projects Releases 7 Wiki Activity

fix(ci): #2081 follow-up——CI 部署脚本修复（compose.yml 由 CI scp + --env-file） #2082

Merged
xiaoxia merged 2 commits from fix/ci-worker-compose-followup into develop 2026-09-28 02:41:32 +08:00
Conversation 2 Commits 2 Files Changed 2
+31 -29
xiaoxia commented 2026-09-28 02:24:11 +08:00
Owner
Copy Link
Copy Source

背景

PR #2081 首次合入后 CI staging deploy 失败（Failing after 1m37s），定位到两个问题：

  1. 部署脚本里用 curl 从私有 Gitea 拉 compose.yml，但 SSH 到服务器时没有传 Authorization token → 404 → compose sync fail
  2. docker compose 默认只从 project 目录读 .env，没传 --env-file ../../.env 导致 GENERATED_FILES_HOST_DIR must be set 变量缺失

修改

  1. scripts/ci_staging_deploy.sh：
    • 去掉 curl 拉取 compose.yml 的逻辑，改为存在性检查（由 CI workflow 在运行脚本前 scp 上传）
    • 封装 compose() 函数统一加 --env-file "$ENV_FILE"，确保卷路径等变量正确加载
    • worker 启动用 WORKER_IMAGE=... compose up -d --no-deps worker
    • 回滚走同样的 compose 调用，compose 失败才 fallback 到 docker run
    • 增加 COMPOSE_SYNC 环境变量（0 = CI 已上传，跳过同步）
  2. .gitea/workflows/ci-pipeline.yml：
    • 在 SSH 执行部署脚本之前，增加一步 scp infra/docker/compose.yml 到服务器 $INFRA_DOCKER_DIR/compose.yml
    • 与现有 .env/cookies 上传流程对齐
  3. 服务器上的 .env 已经包含 GENERATED_FILES_HOST_DIR、GENERATION_CONCURRENCY=2、TRANSCODE_CONCURRENCY=2、BEAT_ENABLED=1，新 compose 启动后会直接使用这些值

影响

  • CI staging 部署后 worker 通过 compose 启动，env/并发/HC/资源限制全部走 compose.yml 单一来源
  • watchtower 重建容器时沿用 compose labels，不会再丢并发配置
  • api/web 仍然 docker run（最小变更面），脚本保留 TODO 后续收敛
## 背景 PR #2081 首次合入后 CI staging deploy 失败（Failing after 1m37s），定位到两个问题： 1. 部署脚本里用 `curl` 从私有 Gitea 拉 compose.yml，但 SSH 到服务器时没有传 Authorization token → 404 → compose sync fail 2. `docker compose` 默认只从 project 目录读 `.env`，没传 `--env-file ../../.env` 导致 `GENERATED_FILES_HOST_DIR must be set` 变量缺失 ## 修改 1. **scripts/ci_staging_deploy.sh**： - 去掉 curl 拉取 compose.yml 的逻辑，改为**存在性检查**（由 CI workflow 在运行脚本前 scp 上传） - 封装 `compose()` 函数统一加 `--env-file "$ENV_FILE"`，确保卷路径等变量正确加载 - worker 启动用 `WORKER_IMAGE=... compose up -d --no-deps worker` - 回滚走同样的 compose 调用，compose 失败才 fallback 到 docker run - 增加 `COMPOSE_SYNC` 环境变量（0 = CI 已上传，跳过同步） 2. **.gitea/workflows/ci-pipeline.yml**： - 在 SSH 执行部署脚本之前，增加一步 `scp infra/docker/compose.yml` 到服务器 `$INFRA_DOCKER_DIR/compose.yml` - 与现有 .env/cookies 上传流程对齐 3. 服务器上的 .env 已经包含 `GENERATED_FILES_HOST_DIR`、`GENERATION_CONCURRENCY=2`、`TRANSCODE_CONCURRENCY=2`、`BEAT_ENABLED=1`，新 compose 启动后会直接使用这些值 ## 影响 - CI staging 部署后 worker 通过 compose 启动，env/并发/HC/资源限制全部走 compose.yml 单一来源 - watchtower 重建容器时沿用 compose labels，不会再丢并发配置 - api/web 仍然 docker run（最小变更面），脚本保留 TODO 后续收敛
xiaoxia added 2 commits 2026-09-28 02:24:11 +08:00
fix(ci): worker compose deploy - remove curl fetch, add --env-file, use existing compose.yml 548be6aced
fix(ci): scp compose.yml to staging host before running deploy script
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 0s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 48s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 50s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m10s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m26s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m0s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 3m10s
Details
CI/CD Pipeline / Validate - Style (pull_request) Successful in 3m14s
Details
CI/CD Pipeline / Validate - Security (pull_request) Successful in 6m13s
Details
AI Code Review / AI Code Review (pull_request) Successful in 6m31s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 10m38s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 14m13s
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
Details
CI/CD Pipeline / CI Gate (pull_request) Successful in 1s
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 33s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m1s
Details
6de6971e7b
gitea-actions bot commented 2026-09-28 02:25:22 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #2082
预览链接 https://pr-2082.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #2082 | | 预览链接 | [https://pr-2082.preview.xiaoxiajianji.com](https://pr-2082.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
xiaoxia merged commit b233529eee into develop 2026-09-28 02:41:32 +08:00
gitea-actions bot commented 2026-09-28 02:42:32 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #2082 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #2082 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot frontend-dev xiaoxia
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#2082
Delete Branch "fix/ci-worker-compose-followup"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?