Commit Graph

12 Commits

Author SHA1 Message Date
lzh
279510dd66 fix: 将并行部署改为串行部署
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 避免多个 SSH 连接同时建立导致的冲突
- 保持构建阶段的并行,只有部署改为串行
2026-01-13 16:36:14 +08:00
lzh
3f4b69d532 perf: 并行构建 + Maven 依赖缓存优化
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
主要改进:
1. 并行构建(最大 2 个服务同时构建)
2. Maven 依赖基础镜像(aiot-deps)
3. 服务构建基于依赖镜像,跳过依赖下载
4. 部署也支持并行

预期效果:后续构建时间从 25分钟 降至 8-12分钟
2026-01-13 16:05:24 +08:00
lzh
7142fe79d9 fix: 移除 BuildKit 依赖,使用传统 Docker 层缓存
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 移除 BuildKit 语法和缓存挂载
- 使用传统 Docker 层缓存优化
- 优化 Dockerfile 层顺序(pom -> 依赖 -> 代码)
- 仍然可以获得较好的缓存效果
2026-01-13 15:40:37 +08:00
lzh
25fad8d6fd perf: 启用 Docker BuildKit 和 Maven 缓存优化构建速度
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 启用 Docker BuildKit 缓存挂载
- 使用 --mount=type=cache 缓存 Maven 依赖
- 优化 Dockerfile 层缓存策略
- 添加构建优化指南文档

预期效果:
- 首次构建: ~30分钟
- 后续构建(无变更): ~2分钟
- 后续构建(有变更): ~5-8分钟
2026-01-13 15:36:29 +08:00
lzh
deabc90f9a fix: 添加部署诊断信息和目录检查
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 添加 SSH 连接测试
- 检查并创建项目目录
- 改进错误提示
2026-01-13 15:30:07 +08:00
lzh
beabec5fb3 fix: 修正宿主机 SSH 地址为 172.19.0.1
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- Jenkins 容器在 1panel-network 网络中
- 网关地址是 172.19.0.1 而不是 172.17.0.1
- Jenkins 负责指挥,实际部署在宿主机执行
2026-01-13 15:13:49 +08:00
lzh
27d3cc4b94 fix: 修复 Jenkins 中 docker compose 命令执行问题
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 使用 docker 的绝对路径 /usr/bin/docker
- 切换到项目目录执行命令
- 确保命令在 Jenkins shell 环境中正确执行
2026-01-13 15:04:34 +08:00
lzh
ceea293412 fix: 使用 docker compose v2 命令替代 docker-compose
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 修改部署脚本使用 'docker compose' 而不是 'docker-compose'
- 兼容新版 Docker Compose v2
2026-01-13 10:42:24 +08:00
lzh
177918ce3d fix: 暂时移除 ops-server(还在开发分支中)
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 从 CORE_SERVICES 列表中移除 viewsh-module-ops-server
- 等待 ops-server 开发完成并合并到 master 后再添加
2026-01-13 10:23:34 +08:00
lzh
7d5cf21bdc fix: 改用 Docker 多阶段构建,移除对 Jenkins Maven 的依赖
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 移除独立的 Maven Build 阶段
- 直接使用 Docker 多阶段构建(Dockerfile 中包含 Maven)
- 改为串行构建避免内存溢出
- 添加更详细的构建日志
2026-01-13 10:00:54 +08:00
lzh
5e2f92f177 fix: 修复 Jenkinsfile 首次构建检测逻辑
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 改用 git rev-parse HEAD~1 检测上一次提交
- 首次构建时正确触发全量构建
- 添加更多调试日志
2026-01-13 09:58:37 +08:00
lzh
b3948df69b feat: 添加 Jenkins CI/CD 配置和部署脚本
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
- 添加 Jenkinsfile 支持智能增量构建
- 添加 Docker 多阶段构建模板
- 添加 Docker Compose 配置(连接 1Panel 中间件)
- 添加部署、回滚、清理脚本
- 添加环境变量配置模板
2026-01-13 09:49:19 +08:00