From feb82f596d05544a4a55bc1461133fd425acdb16 Mon Sep 17 00:00:00 2001
From: hotwa <pylyzeng@gmail.com>
Date: Tue, 30 Sep 2025 16:17:05 +0800
Subject: [PATCH] update step: Build Docker Image

---
 .gitea/workflows/build-and-push.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml
index 09048c9..09e9c67 100644
--- a/.gitea/workflows/build-and-push.yml
+++ b/.gitea/workflows/build-and-push.yml
@@ -53,19 +53,19 @@ jobs:
 
       - name: Build Docker Image
         env:
-          REGISTRY:  ${{ secrets.ACR_REGISTRY }}
-          NAMESPACE: ${{ secrets.ACR_NAMESPACE }}
-          IMAGE:     ${{ secrets.ACR_REGISTRY }}/${{ secrets.ACR_NAMESPACE }}/${{ vars.IMAGE_NAME }}
-          TAG:       ${{ steps.meta.outputs.tag }}
+          IMAGE: ${{ secrets.ACR_REGISTRY }}/${{ secrets.ACR_NAMESPACE }}/${{ vars.IMAGE_NAME }}
+          TAG:   ${{ steps.meta.outputs.tag }}
         run: |
           set -euo pipefail
           echo "Building ${IMAGE}:${TAG}"
-          docker build -t "${IMAGE}:${TAG}" -f docker/Dockerfile .
 
-          # 可选：在 main 或 release 时同时打 latest
-          if [ "${{ github.event_name }}" = "release" ] || [ "${{ github.ref_name }}" = "main" ]; then
-            docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest"
-          fi
+          # 确保构建时使用 proxy_net，并把代理传给 RUN 阶段
+          docker build \
+            --network=proxy_net \
+            --build-arg HTTP_PROXY=http://proxy:7890 \
+            --build-arg HTTPS_PROXY=http://proxy:7890 \
+            --build-arg NO_PROXY=localhost,127.0.0.1,proxy \
+            -t "${IMAGE}:${TAG}" -f docker/Dockerfile .
 
       - name: Push Docker Image
         env: