From 1e1843fc17f3754027a38ec0dd84666c125be8fa Mon Sep 17 00:00:00 2001 From: Wenjie Zhang Date: Wed, 28 Jan 2026 00:44:59 +0800 Subject: [PATCH] =?UTF-8?q?chore(docker):=20=E7=A7=BB=E9=99=A4=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E7=9A=84=E4=BB=A3=E7=90=86=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除 docker-compose.yml 和 api.Dockerfile 中关于 HTTP/HTTPS 代理的构建参数和环境变量设置。这些配置在网络状况良好时并非必需，且可能在某些环境下导致构建问题。简化配置以提高构建的通用性和可靠性。 --- docker-compose.yml | 3 --- docker/api.Dockerfile | 11 ----------- 2 files changed, 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 21e62fd3..665ed6ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,6 @@ services: build: context: . dockerfile: docker/api.Dockerfile - args: - HTTP_PROXY: ${HTTP_PROXY:-} - HTTPS_PROXY: ${HTTPS_PROXY:-} image: yuxi-api:0.5.dev container_name: api-dev working_dir: /app diff --git a/docker/api.Dockerfile b/docker/api.Dockerfile index d262b1cb..9b988881 100644 --- a/docker/api.Dockerfile +++ b/docker/api.Dockerfile @@ -41,17 +41,6 @@ COPY ../pyproject.toml /app/pyproject.toml COPY ../.python-version /app/.python-version COPY ../uv.lock /app/uv.lock - -# 接收构建参数(如果出现代理错误，则把下面关于环境变量的都注释掉，并注释掉 dock-compose.yml 的 6-8 行) -ARG HTTP_PROXY="" -ARG HTTPS_PROXY="" - -# 设置环境变量（这些值可能是空的） -ENV HTTP_PROXY=$HTTP_PROXY \ - HTTPS_PROXY=$HTTPS_PROXY \ - http_proxy=$HTTP_PROXY \ - https_proxy=$HTTPS_PROXY - # 如果网络还是不好，可以在后面添加 --index-url https://pypi.tuna.tsinghua.edu.cn/simple RUN --mount=type=cache,target=/root/.cache/uv \ uv sync --no-dev --frozen