xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 9 Pull Requests 2 Actions 1 Packages Projects Releases 7 Wiki Activity

perf(ci): 恢复registry cache-to写入，ACR已改为tag可变 #681

Merged
xiaoxia merged 1 commits from opt/restore-registry-cache-to into develop 2026-07-21 19:01:55 +08:00
Conversation 4 Commits 1 Files Changed 1
+8 -6
xiaoxia commented 2026-07-21 13:54:19 +08:00
Owner
Copy Link
Copy Source

背景

ACR缓存仓库（api-cache/worker-cache/web-cache）已从tag不可变改为tag可变，现在可以安全地写入registry缓存了。

改动

  • 恢复2处--cache-to type=registry写入
  • 保留ignore-error=true作为兜底（防止ACR配置回退导致构建失败）
  • --cache-from的ignore-error去掉了（tag可变后正常写入不会读不到）

预期收益

  • 跨runner缓存共享真正生效：12个runner之间可以通过ACR共享构建缓存
  • 冷启动次数大幅减少：任意runner第一次构建也能从ACR拉到最近的缓存层
  • 整体Docker build耗时预计下降30-50%（从registry缓存层恢复比重新构建快很多）

验证

  • 第一次合入后构建会稍慢（需要写缓存）
  • 第二次起应该能看到明显加速
## 背景 ACR缓存仓库（api-cache/worker-cache/web-cache）已从tag不可变改为tag可变，现在可以安全地写入registry缓存了。 ## 改动 - 恢复2处`--cache-to type=registry`写入 - 保留`ignore-error=true`作为兜底（防止ACR配置回退导致构建失败） - `--cache-from`的`ignore-error`去掉了（tag可变后正常写入不会读不到） ## 预期收益 - 跨runner缓存共享真正生效：12个runner之间可以通过ACR共享构建缓存 - 冷启动次数大幅减少：任意runner第一次构建也能从ACR拉到最近的缓存层 - 整体Docker build耗时预计下降30-50%（从registry缓存层恢复比重新构建快很多） ## 验证 - 第一次合入后构建会稍慢（需要写缓存） - 第二次起应该能看到明显加速
xiaoxia added 1 commit 2026-07-21 13:54:20 +08:00
perf(ci): 恢复registry cache-to写入，ACR已改为tag可变
AI Code Review / AI Code Review (pull_request) Successful in 2m51s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Failing after 2m46s
Details
PR Automation / Auto Approve on CI Green (pull_request) Failing after 2m51s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 2m28s
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 / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production 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 / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 9s
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 1m25s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m59s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m12s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m4s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 21s
Details
933973311f 
- 恢复2处--cache-to type=registry写入
- 保留ignore-error=true作为兜底（防止ACR配置回退导致构建失败）
- cache-from的ignore-error也去掉了（tag可变后正常写入不会报错）

前提：阿里云ACR缓存仓库（api-cache/worker-cache/web-cache）已从不可变改为可变tag
auto-approve-bot commented 2026-07-21 14:02:00 +08:00
Collaborator
Copy Link
Copy Source

代码审查结果 - PR #681

⚠️ 问题（2个需要修改）

  1. scripts/ci/docker_build_push.sh 第54行：移除了 --cache-from 中的 ignore-error=true 参数。这会导致当 Registry 缓存镜像不存在（如首次构建）或网络不可达时，构建命令直接失败，无法优雅降级到仅使用本地缓存。
  2. scripts/ci/docker_build_push.sh 第86行：同上，在 fallback 分支中也移除了 ignore-error=true，存在相同的构建中断风险。

💡 建议（1个可选）

  1. 性能关注：新增了 --cache-to type=registry,mode=max，这将把构建缓存推送到 Registry。虽然实现了缓存共享，但会增加构建时间和网络负载。请确认这是否与之前注释中提到的 "M-2优化：解决registry缓存导入慢(247s)" 目标冲突，避免引入新的性能瓶颈。

✅ 格式检查通过 | ❌ 逻辑审查需修改 | ⚠️ 建议关注性能

🤖 由 AI 代码审查机器人自动生成 | 2026-07-21 14:02:00 | 模型:

## 代码审查结果 - PR #681 ### ⚠️ 问题（2个需要修改） 1. **scripts/ci/docker_build_push.sh 第54行**：移除了 `--cache-from` 中的 `ignore-error=true` 参数。这会导致当 Registry 缓存镜像不存在（如首次构建）或网络不可达时，构建命令直接失败，无法优雅降级到仅使用本地缓存。 2. **scripts/ci/docker_build_push.sh 第86行**：同上，在 fallback 分支中也移除了 `ignore-error=true`，存在相同的构建中断风险。 ### 💡 建议（1个可选） 1. **性能关注**：新增了 `--cache-to type=registry,mode=max`，这将把构建缓存推送到 Registry。虽然实现了缓存共享，但会增加构建时间和网络负载。请确认这是否与之前注释中提到的 "M-2优化：解决registry缓存导入慢(247s)" 目标冲突，避免引入新的性能瓶颈。 --- ✅ 格式检查通过 | ❌ 逻辑审查需修改 | ⚠️ 建议关注性能 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-07-21 14:02:00 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
xiaoxia reviewed 2026-07-21 19:01:23 +08:00
xiaoxia left a comment
Author
Owner
Copy Link
Copy Source

PG连接问题已修复，4个门禁全绿，approved.

PG连接问题已修复，4个门禁全绿，approved.
xiaoxia reviewed 2026-07-21 19:01:46 +08:00
xiaoxia left a comment
Author
Owner
Copy Link
Copy Source

PG连接问题已修复，4个门禁全绿，批准合并。

PG连接问题已修复，4个门禁全绿，批准合并。
xiaoxia merged commit a2a8d163f9 into develop 2026-07-21 19:01:55 +08:00
gitea-actions bot commented 2026-07-21 19:02:16 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

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

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

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

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#681
Delete Branch "opt/restore-registry-cache-to"

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?