From 3e4981a74d699c9f29fe457e4aca694d134c506f Mon Sep 17 00:00:00 2001 From: hotwa Date: Tue, 30 Sep 2025 16:47:16 +0800 Subject: [PATCH] use host.docker.internal proxy build --- .gitea/workflows/build-and-push.yml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml index 5bbf057..8174ec6 100644 --- a/.gitea/workflows/build-and-push.yml +++ b/.gitea/workflows/build-and-push.yml @@ -51,36 +51,21 @@ jobs: echo "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" \ --username "$ACR_USERNAME" --password-stdin - - name: Build Docker Image (proxy_net, one step) + - name: Build Docker Image (via host proxy) env: IMAGE: ${{ secrets.ACR_REGISTRY }}/${{ secrets.ACR_NAMESPACE }}/${{ vars.IMAGE_NAME }} TAG: ${{ steps.meta.outputs.tag }} run: | set -euo pipefail - - # 1) 确保网络存在 - docker network inspect proxy_net >/dev/null 2>&1 || docker network create proxy_net - - # 2) 重新创建并启用 builder，加入 proxy_net 且注入默认代理 - docker buildx rm ci-builder >/dev/null 2>&1 || true - docker buildx create \ - --name ci-builder --use \ - --driver docker-container \ - --driver-opt network=proxy_net \ - --driver-opt env.http_proxy=http://proxy:7890,env.https_proxy=http://proxy:7890 \ - >/dev/null - - # 3) 构建（通过代理）。若想本步直接推仓库，把 --load 改成 --push docker buildx build \ - --builder ci-builder \ --progress=plain \ - --build-arg HTTP_PROXY=http://proxy:7890 \ - --build-arg HTTPS_PROXY=http://proxy:7890 \ - --build-arg NO_PROXY=localhost,127.0.0.1,proxy \ + --add-host=host.docker.internal:host-gateway \ + --build-arg HTTP_PROXY=http://host.docker.internal:7890 \ + --build-arg HTTPS_PROXY=http://host.docker.internal:7890 \ + --build-arg NO_PROXY=localhost,127.0.0.1 \ --load \ -t "${IMAGE}:${TAG}" -f docker/Dockerfile . - - name: Push Docker Image env: IMAGE: ${{ secrets.ACR_REGISTRY }}/${{ secrets.ACR_NAMESPACE }}/${{ vars.IMAGE_NAME }}