diff --git a/docker/Dockerfile b/docker/Dockerfile index 2f1341b..1f302a9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -93,7 +93,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # 阶段 4:CMake 4.0(vllm 要求 ≥ 4.0,Ubuntu 24.04 自带 3.28 不够) # =========================================================================== RUN cd /tmp && \ - wget -q ${GH_PROXY}https://github.com/Kitware/CMake/releases/download/v4.0.0/cmake-4.0.0-linux-x86_64.tar.gz && \ + # 优先直连 GitHub(network: host 可用),失败则尝试 ghproxy 备用 + (wget -q https://github.com/Kitware/CMake/releases/download/v4.0.0/cmake-4.0.0-linux-x86_64.tar.gz || \ + wget -q ${GH_PROXY}https://github.com/Kitware/CMake/releases/download/v4.0.0/cmake-4.0.0-linux-x86_64.tar.gz || \ + wget -q https://gh-proxy.com/https://github.com/Kitware/CMake/releases/download/v4.0.0/cmake-4.0.0-linux-x86_64.tar.gz) && \ tar -xzf cmake-4.0.0-linux-x86_64.tar.gz && \ cp -r cmake-4.0.0-linux-x86_64/bin/* /usr/local/bin/ && \ cp -r cmake-4.0.0-linux-x86_64/share/* /usr/local/share/ && \ @@ -128,11 +131,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ apt-get clean && rm -rf /var/lib/apt/lists/* # =========================================================================== -# 阶段 7:amd-aiter + flash_attn(GitHub 通过 ghproxy 加速) +# 阶段 7:amd-aiter + flash_attn # =========================================================================== RUN set -ex && \ - # 配置 git 走 ghproxy - git config --global url."${GH_PROXY}https://github.com/".insteadOf "https://github.com/" && \ # aiter(AMD 优化的 attention 算子) cd /opt && git clone --recursive --depth 1 https://github.com/ROCm/aiter.git && \ ${VENV}/bin/pip install --no-cache-dir -e /opt/aiter && \ @@ -147,8 +148,6 @@ RUN set -ex && \ # 阶段 8:编译 vllm # =========================================================================== RUN set -ex && \ - # 配置 git 走 ghproxy(新 RUN 层需重新配置) - git config --global url."${GH_PROXY}https://github.com/".insteadOf "https://github.com/" && \ # setuptools 升级(PEP 639 兼容) ${VENV}/bin/pip install --no-cache-dir -U \ "setuptools>=77.0.3" setuptools_scm setuptools_rust wheel && \