fix:bug

Author: juoiy

.github/workflows/build.yml

@@ -5,7 +5,10 @@ on: [push, pull_request]
 jobs:
   build-php:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     strategy:
+      fail-fast: false
+      max-parallel: 3  # 限制并发数量，避免资源争抢
       matrix:
         php_version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
         service: ["php-fpm", "php-worker", "workspace"]
@@ -38,6 +41,27 @@ jobs:
         
         echo "=== 环境检查完成 ==="
     
+    - name: Docker optimization
+      run: |
+        echo "=== Docker优化配置 ==="
+        
+        # 清理Docker缓存
+        docker system prune -f || true
+        
+        # 预热Docker守护进程
+        echo "预热Docker守护进程..."
+        docker run --rm hello-world
+        
+        # 显示Docker存储信息
+        echo "Docker存储信息:"
+        docker system df
+        
+        # 显示当前运行的容器
+        echo "当前容器:"
+        docker ps -a
+        
+        echo "=== Docker优化完成 ==="
+    
     - name: Build the Docker image
       env:
         PHP_VERSION: ${{ matrix.php_version }}
@@ -51,7 +75,9 @@ jobs:
         ./build-image.sh
   build-mysql:
     runs-on: ubuntu-latest
+    timeout-minutes: 45
     strategy:
+      fail-fast: false
       matrix:
         mysql_version: ["5.7", "8.0"]
         service: ["mysql"]
@@ -82,7 +108,10 @@ jobs:
       run: ./build-image.sh
   build-other:
     runs-on: ubuntu-latest
+    timeout-minutes: 45
     strategy:
+      fail-fast: false
+      max-parallel: 2  # 限制并发数量
       matrix:
         service: ["redis", "mongo", "nginx", "elasticsearch"]
     steps:

build-image.sh

@@ -148,14 +148,54 @@ cat .env
 
 # 检查并使用正确的docker compose命令
 echo "=== 开始构建Docker镜像 ==="
-if docker compose version > /dev/null 2>&1; then
-    echo "使用 docker compose (plugin) 构建镜像..."
-    docker compose build ${BUILD_SERVICE}
-elif docker-compose --version > /dev/null 2>&1; then
-    echo "使用 docker-compose (standalone) 构建镜像..."
-    docker-compose build ${BUILD_SERVICE}
+
+# 构建重试函数
+build_with_retry() {
+    local max_attempts=3
+    local attempt=1
+    
+    while [ $attempt -le $max_attempts ]; do
+        echo "构建尝试 $attempt/$max_attempts..."
+        
+        if docker compose version > /dev/null 2>&1; then
+            echo "使用 docker compose (plugin) 构建镜像..."
+            if timeout 3600 docker compose build --no-cache ${BUILD_SERVICE}; then
+                echo "✅ 构建成功！"
+                return 0
+            fi
+        elif docker-compose --version > /dev/null 2>&1; then
+            echo "使用 docker-compose (standalone) 构建镜像..."
+            if timeout 3600 docker-compose build --no-cache ${BUILD_SERVICE}; then
+                echo "✅ 构建成功！"
+                return 0
+            fi
+        else
+            echo "❌ 错误: 找不到 docker compose 或 docker-compose 命令"
+            exit 1
+        fi
+        
+        if [ $attempt -lt $max_attempts ]; then
+            echo "⚠️  构建失败，等待30秒后重试..."
+            sleep 30
+            
+            # 清理Docker缓存
+            echo "清理Docker构建缓存..."
+            docker builder prune -f || true
+            docker system prune -f || true
+        fi
+        
+        attempt=$((attempt + 1))
+    done
+    
+    echo "❌ 所有构建尝试都失败了"
+    return 1
+}
+
+# 执行构建
+if build_with_retry; then
+    echo "🎉 Docker镜像构建完成！"
 else
-    echo "❌ 错误: 找不到 docker compose 或 docker-compose 命令"
+    echo "💥 Docker镜像构建失败！"
     exit 1
 fi
 #####################################