cyc

Jenkinsfile

@@ -128,7 +128,10 @@ pipeline {
                         cp -r deploy-package/frontend-dist/* /opt/nginx/html/ai/current/
                         cp -r deploy-package/backend/* /opt/nginx/html/ai/current/backend/
                         [ -d deploy-package/shared ] && cp -r deploy-package/shared /opt/nginx/html/ai/current/
+                        # 复制 Docker 配置文件，确保文件名为 docker-compose.yml（podman-compose 需要）
+                        cp deploy-package/docker/docker-compose.production.yml /opt/nginx/html/ai/current/docker/docker-compose.yml 2>/dev/null || \
                         cp deploy-package/docker/* /opt/nginx/html/ai/current/docker/
+                        cp deploy-package/docker/nginx.conf.docker /opt/nginx/html/ai/current/docker/ 2>/dev/null || true
                         
                         # 执行部署脚本（包含停止、构建、启动和健康检查）
                         chmod +x deploy-package/deploy-docker.sh

scripts/deploy-docker.sh

@@ -65,13 +65,40 @@ fi
 
 cd "$DOCKER_DIR" || exit 1
 
+# 确定 compose 文件路径（podman-compose 默认查找 docker-compose.yml）
+COMPOSE_FILE="docker-compose.yml"
+if [ ! -f "$COMPOSE_FILE" ]; then
+    # 如果不存在，尝试其他可能的文件名
+    if [ -f "docker-compose.production.yml" ]; then
+        COMPOSE_FILE="docker-compose.production.yml"
+    elif [ -f "compose.yml" ]; then
+        COMPOSE_FILE="compose.yml"
+    else
+        echo "错误: 未找到 docker-compose.yml 文件"
+        echo "当前目录: $(pwd)"
+        echo "文件列表:"
+        ls -la || true
+        exit 1
+    fi
+fi
+
+echo "使用 Compose 文件: $COMPOSE_FILE"
+
 # 停止旧容器（如果存在）
 echo "停止旧容器..."
-$COMPOSE_CMD down || true
+if [ "$COMPOSE_FILE" = "docker-compose.yml" ]; then
+    $COMPOSE_CMD down || true
+else
+    $COMPOSE_CMD -f "$COMPOSE_FILE" down || true
+fi
 
 # 构建并启动服务
 echo "构建并启动容器服务..."
-$COMPOSE_CMD up -d --build
+if [ "$COMPOSE_FILE" = "docker-compose.yml" ]; then
+    $COMPOSE_CMD up -d --build
+else
+    $COMPOSE_CMD -f "$COMPOSE_FILE" up -d --build
+fi
 
 # 等待服务启动
 echo "等待服务启动..."