From 32b4053ed36fb2686aa9c2ab81aa7c0b87feff8c Mon Sep 17 00:00:00 2001
From: xiaoquan <838115837@qq.com>
Date: Wed, 10 Jun 2026 18:02:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=20docker=20compose=20?=
 =?UTF-8?q?V2=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 修改内容
- 使用 `docker compose` (V2，空格分隔)
- 备用方案：`docker-compose` (V1，连字符)
- 通过 || 运算符自动尝试两种版本

## 说明
- Docker Compose V2 已内置在 Docker 中
- 命令格式：docker compose（不是 docker-compose）
- 如果 V2 不可用，自动回退到 V1

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .gitea/workflows/deploy.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 29ed21b..e70cd9f 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -47,14 +47,15 @@ jobs:
           export TEST_JWT_SECRET="${{ secrets.TEST_JWT_SECRET }}"
           export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
 
-          docker-compose -f docker-compose.test.yml down --remove-orphans
-          docker-compose -f docker-compose.test.yml build --parallel
-          docker-compose -f docker-compose.test.yml up -d
+          # 使用 docker compose（V2 版本，空格分隔）
+          docker compose -f docker-compose.test.yml down --remove-orphans || docker-compose -f docker-compose.test.yml down --remove-orphans
+          docker compose -f docker-compose.test.yml build --parallel || docker-compose -f docker-compose.test.yml build --parallel
+          docker compose -f docker-compose.test.yml up -d || docker-compose -f docker-compose.test.yml up -d
           docker image prune -f
 
           echo "等待服务启动..."
           sleep 10
-          docker-compose -f docker-compose.test.yml ps
+          docker compose -f docker-compose.test.yml ps || docker-compose -f docker-compose.test.yml ps
           echo "✅ 测试环境部署完成"
 
       - name: Deploy to production
@@ -67,12 +68,13 @@ jobs:
           export PROD_JWT_SECRET="${{ secrets.PROD_JWT_SECRET }}"
           export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
 
-          docker-compose -f docker-compose.prod.yml down --remove-orphans
-          docker-compose -f docker-compose.prod.yml build --parallel
-          docker-compose -f docker-compose.prod.yml up -d
+          # 使用 docker compose（V2 版本，空格分隔）
+          docker compose -f docker-compose.prod.yml down --remove-orphans || docker-compose -f docker-compose.prod.yml down --remove-orphans
+          docker compose -f docker-compose.prod.yml build --parallel || docker-compose -f docker-compose.prod.yml build --parallel
+          docker compose -f docker-compose.prod.yml up -d || docker-compose -f docker-compose.prod.yml up -d
           docker image prune -f
 
           echo "等待服务启动..."
           sleep 10
-          docker-compose -f docker-compose.prod.yml ps
+          docker compose -f docker-compose.prod.yml ps || docker-compose -f docker-compose.prod.yml ps
           echo "✅ 生产环境部署完成"