t1

.gitea/workflows/test.yml

@@ -28,55 +28,45 @@ jobs:
         REGISTRY_HOST=$(echo "${{ gitea.server_url }}" | sed 's|https\?://||')
         echo "📡 Registry地址: $REGISTRY_HOST"
         
-        # 配置daemon.json
+        # 停止Docker服务
-        # sudo mkdir -p /etc/docker
+        sudo systemctl stop docker || sudo service docker stop || true
-        # sudo tee /etc/docker/daemon.json <<EOF
-        # {
-        #   "insecure-registries": ["$REGISTRY_HOST"],
-        #   "registry-mirrors": []
-        # }
-        # EOF
         
-        # 重新加载Docker配置
+        # 配置daemon.json
-        # sudo pkill -SIGHUP dockerd || true
+        sudo mkdir -p /etc/docker
-        # sleep 1
+        sudo tee /etc/docker/daemon.json <<EOF
+        {
+          "insecure-registries": ["$REGISTRY_HOST"],
+          "registry-mirrors": []
+        }
+        EOF
+        
+        # 启动Docker服务
+        sudo systemctl start docker || sudo service docker start || true
+        
+        # 等待Docker启动
+        sleep 10
+        
+        # 验证Docker状态
+        docker info | grep -i insecure || true
         
         echo "✅ Docker配置完成！"
         
     - name: 登录到Gitea Container Registry
-      env:
-        DOCKER_BUILDKIT: 0
-        DOCKER_CLI_EXPERIMENTAL: disabled
       run: |
         echo "🔐 登录到Gitea Container Registry..."
         
         # 获取registry地址
         REGISTRY_HOST=$(echo "${{ gitea.server_url }}" | sed 's|https\?://||')
-        
         cat /etc/docker/daemon.json
-
         echo "📡 Registry地址: $REGISTRY_HOST"
         echo "👤 用户名: ${{ gitea.actor }}"
         
-        # 创建Docker客户端配置
+        # 使用HTTP协议登录
-        mkdir -p ~/.docker
+        echo "${{ gitea.token }}" | docker login $REGISTRY_HOST -u "${{ gitea.actor }}" --password-stdin
-        cat > ~/.docker/config.json <<EOF
-        {
-          "auths": {},
-          "HttpHeaders": {
-            "User-Agent": "Docker-Client/20.10.21 (linux)"
-          }
-        }
-        EOF
-        
-        # 使用HTTP协议登录 - 明确指定http://
-        echo "${{ gitea.token }}" | docker login http://$REGISTRY_HOST -u "${{ gitea.actor }}" --password-stdin
         
         echo "✅ 登录成功！"
         
     - name: 构造Docker镜像
-      env:
-        DOCKER_BUILDKIT: 0
       run: |
         echo "🐳 构造Node.js Hello World应用镜像..."
         
@@ -96,8 +86,6 @@ jobs:
         echo "✅ Node.js Hello World镜像构造完成！"
         
     - name: 推送Docker镜像
-      env:
-        DOCKER_BUILDKIT: 0
       run: |
         echo "🚀 推送Docker镜像到Gitea registry..."