diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 7824980..6796eb1 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -15,6 +15,9 @@ jobs: - name: Build and Restart Docker Containers run: | echo "🚀 [CI/CD] 检测到代码更新,开始执行自动部署..." + # 清理此前遗留的独立 blog-mysql 容器(若存在) + docker stop blog-mysql 2>/dev/null || true + docker rm blog-mysql 2>/dev/null || true docker compose down docker compose up -d --build echo "✅ [CI/CD] 容器重构完成,最新版本已上线!" diff --git a/deploy.sh b/deploy.sh index d3ec630..c074bd2 100644 --- a/deploy.sh +++ b/deploy.sh @@ -11,12 +11,16 @@ if [ -d ".git" ]; then git pull origin main || true fi -# 2. 重新编译后端与前端容器 +# 2. 清理旧的独立 blog-mysql 容器(改用 1Panel 现有 MySQL) +docker stop blog-mysql 2>/dev/null || true +docker rm blog-mysql 2>/dev/null || true + +# 3. 重新编译后端与前端容器 echo "🐳 [Docker] 重新构建并运行全栈容器..." docker compose down docker compose up -d --build -# 3. 检查服务健康状态 +# 4. 检查服务健康状态 echo "⏳ [HealthCheck] 等待服务启动..." sleep 3 docker ps --filter "name=blog-"