From 5823c083eb295b4f7245dbecfcd5c31fb0bf73b4 Mon Sep 17 00:00:00 2001
From: gitea_admin <gitea@173114.xyz>
Date: Thu, 18 Dec 2025 06:23:02 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.github/workflows/buidl=5F?=
 =?UTF-8?q?and=5Fpush=5Fghcr.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/buidl_and_push_ghcr.yml | 64 ++++++++++++-----------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/buidl_and_push_ghcr.yml b/.github/workflows/buidl_and_push_ghcr.yml
index 729e22c..daf16ba 100644
--- a/.github/workflows/buidl_and_push_ghcr.yml
+++ b/.github/workflows/buidl_and_push_ghcr.yml
@@ -17,12 +17,13 @@ jobs:
         with:
           fetch-depth: 0
 
+      # 1. 提取变量步骤保持不变，这很有用
       - name: Get Meta
         id: meta
         run: |
           # 【修改点】不要自动抓取，直接写死你的外部 HTTPS 域名 (不带 https://)
           # 例如: git.example.com
-          REGISTRY_HOST="gitea.173114.xyz" 
+          REGISTRY_HOST="你的外部域名.com" 
           
           REPO_LOWER=$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
           SHA_SHORT=$(git rev-parse --short HEAD)
@@ -30,34 +31,37 @@ jobs:
           echo "REGISTRY_HOST=$REGISTRY_HOST" >> $GITHUB_OUTPUT
           echo "IMAGE_NAME=$REPO_LOWER" >> $GITHUB_OUTPUT
           echo "VERSION_SHA=$SHA_SHORT" >> $GITHUB_OUTPUT
+          
+          # 打印一下，方便调试
+          echo "Will build: $REGISTRY_HOST/$REPO_LOWER:$SHA_SHORT"
 
-        # 2. 登录步骤 (Login Action 通常没问题，它只写配置文件)
-        - 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 }}
+      # 2. 登录步骤 (Login Action 通常没问题，它只写配置文件)
+      - 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 }}
 
-        # 3. 【核心修改】使用原生 Shell 命令替代 setup-buildx 和 build-push-action
-        # 这样直接使用 runner 宿主机的 docker 客户端，绕过 JS 库的连接 bug
-        - name: Build and Push (Native)
-          env:
-            REGISTRY: ${{ steps.meta.outputs.REGISTRY_HOST }}
-            IMAGE: ${{ steps.meta.outputs.IMAGE_NAME }}
-            TAG_LATEST: latest
-            TAG_SHA: ${{ steps.meta.outputs.VERSION_SHA }}
-          run: |
-            FULL_IMAGE_NAME="$REGISTRY/$IMAGE"
-            
-            echo "Building $FULL_IMAGE_NAME..."
-            
-            # 直接使用 docker build
-            docker build . \
-              --file Dockerfile \
-              --tag "$FULL_IMAGE_NAME:$TAG_LATEST" \
-              --tag "$FULL_IMAGE_NAME:$TAG_SHA"
-            
-            echo "Pushing images..."
-            docker push "$FULL_IMAGE_NAME:$TAG_LATEST"
-            docker push "$FULL_IMAGE_NAME:$TAG_SHA"
\ No newline at end of file
+      # 3. 【核心修改】使用原生 Shell 命令替代 setup-buildx 和 build-push-action
+      # 这样直接使用 runner 宿主机的 docker 客户端，绕过 JS 库的连接 bug
+      - name: Build and Push (Native)
+        env:
+          REGISTRY: ${{ steps.meta.outputs.REGISTRY_HOST }}
+          IMAGE: ${{ steps.meta.outputs.IMAGE_NAME }}
+          TAG_LATEST: latest
+          TAG_SHA: ${{ steps.meta.outputs.VERSION_SHA }}
+        run: |
+          FULL_IMAGE_NAME="$REGISTRY/$IMAGE"
+          
+          echo "Building $FULL_IMAGE_NAME..."
+          
+          # 直接使用 docker build
+          docker build . \
+            --file Dockerfile \
+            --tag "$FULL_IMAGE_NAME:$TAG_LATEST" \
+            --tag "$FULL_IMAGE_NAME:$TAG_SHA"
+          
+          echo "Pushing images..."
+          docker push "$FULL_IMAGE_NAME:$TAG_LATEST"
+          docker push "$FULL_IMAGE_NAME:$TAG_SHA"
\ No newline at end of file