更新 .github/workflows/buidl_and_push_ghcr.yml

.github/workflows/buidl_and_push_ghcr.yml

@@ -17,35 +17,31 @@ jobs:
         with:
           fetch-depth: 0
 
-      # 1. 提取变量步骤保持不变，这很有用
 - name: Get Meta
         id: meta
         run: |
-          # 提取 Gitea 地址并去除 http(s)://
+          # 【修改点】不要自动抓取，直接写死你的外部 HTTPS 域名 (不带 https://)
-          REGISTRY_HOST=$(echo "${{ gitea.server_url }}" | sed -E 's/^\s*.*:\/\///g')
+          # 例如: git.example.com
-          # 仓库名转小写
+          REGISTRY_HOST="gitea.173114.xyz" 
+          
           REPO_LOWER=$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
-          # 获取短 Commit SHA
           SHA_SHORT=$(git rev-parse --short HEAD)
 
           echo "REGISTRY_HOST=$REGISTRY_HOST" >> $GITHUB_OUTPUT
           echo "IMAGE_NAME=$REPO_LOWER" >> $GITHUB_OUTPUT
           echo "VERSION_SHA=$SHA_SHORT" >> $GITHUB_OUTPUT
 
-          # 打印一下，方便调试
+        # 2. 登录步骤 (Login Action 通常没问题，它只写配置文件)
-          echo "Will build: $REGISTRY_HOST/$REPO_LOWER:$SHA_SHORT"
+        - name: Log in to Gitea Registry
+          uses: docker/login-action@v3
+          with:
+            registry: ${{ steps.meta.outputs.REGISTRY_HOST }}
+            username: ${{ gitea.actor }}
+            password: ${{ secrets.GITHUB_TOKEN }}
 
-      # 替换掉原有的 docker login 步骤
+        # 3. 【核心修改】使用原生 Shell 命令替代 setup-buildx 和 build-push-action
-      - name: Log in to Gitea Registry (Buildah)
+        # 这样直接使用 runner 宿主机的 docker 客户端，绕过 JS 库的连接 bug
-        run: |
+        - name: Build and Push (Native)
-          # --tls-verify=false 允许 HTTP 登录
-          buildah login --tls-verify=false \
-            -u ${{ gitea.actor }} \
-            -p ${{ secrets.GITHUB_TOKEN }} \
-            ${{ steps.meta.outputs.REGISTRY_HOST }}
-
-      # 替换掉原有的 docker build/push 步骤
-      - name: Build and Push with Buildah
           env:
             REGISTRY: ${{ steps.meta.outputs.REGISTRY_HOST }}
             IMAGE: ${{ steps.meta.outputs.IMAGE_NAME }}
@@ -56,15 +52,12 @@ jobs:
             
             echo "Building $FULL_IMAGE_NAME..."
             
-          # 使用 buildah bud (build-using-dockerfile)
+            # 直接使用 docker build
-          buildah bud \
+            docker build . \
-            --format docker \
+              --file Dockerfile \
-            -f Dockerfile \
+              --tag "$FULL_IMAGE_NAME:$TAG_LATEST" \
-            -t "$FULL_IMAGE_NAME:$TAG_LATEST" \
+              --tag "$FULL_IMAGE_NAME:$TAG_SHA"
-            -t "$FULL_IMAGE_NAME:$TAG_SHA" \
-            .
             
             echo "Pushing images..."
-          # 关键参数：--tls-verify=false 允许推送到 HTTP 仓库
+            docker push "$FULL_IMAGE_NAME:$TAG_LATEST"
-          buildah push --tls-verify=false "$FULL_IMAGE_NAME:$TAG_LATEST"
+            docker push "$FULL_IMAGE_NAME:$TAG_SHA"
-          buildah push --tls-verify=false "$FULL_IMAGE_NAME:$TAG_SHA"