Add ARG HTTP_PROXY in Dockerfile to support HTTP proxy during image building.This commit introduces an ARG parameter named HTTP_PROXY in the Dockerfile. This addition allows for the configuration of an HTTP proxy, facilitating image building in environments with network restrictions.

Former-commit-id: d59fe30bca636bc2ca132d50172dba0032cecb6b
This commit is contained in:
shibingli@yeah.net 2024-12-27 18:17:17 +08:00
parent 5769a553d2
commit 2dedf7b401

View File

@ -17,16 +17,27 @@ ARG INSTALL_LIGER_KERNEL=false
ARG INSTALL_HQQ=false ARG INSTALL_HQQ=false
ARG INSTALL_EETQ=false ARG INSTALL_EETQ=false
ARG PIP_INDEX=https://pypi.org/simple ARG PIP_INDEX=https://pypi.org/simple
ARG HTTP_PROXY=
# Set the working directory # Set the working directory
WORKDIR /app WORKDIR /app
RUN if [ -n "$HTTP_PROXY" ]; then \
echo "Configuring proxy..."; \
export http_proxy=$HTTP_PROXY; \
export https_proxy=$HTTP_PROXY; \
fi
# Install the requirements # Install the requirements
COPY requirements.txt /app COPY requirements.txt /app
RUN pip config set global.index-url "$PIP_INDEX" && \ RUN pip config set global.index-url "$PIP_INDEX" && \
pip config set global.extra-index-url "$PIP_INDEX" && \ pip config set global.extra-index-url "$PIP_INDEX" && \
python -m pip install --upgrade pip && \ python -m pip install --upgrade pip && \
python -m pip install -r requirements.txt if [ -n "$HTTP_PROXY" ]; then \
python -m pip install --proxy=$HTTP_PROXY -r requirements.txt; \
else \
python -m pip install -r requirements.txt; \
fi
# Copy the rest of the application into the image # Copy the rest of the application into the image
COPY . /app COPY . /app
@ -51,13 +62,29 @@ RUN EXTRA_PACKAGES="metrics"; \
if [ "$INSTALL_EETQ" == "true" ]; then \ if [ "$INSTALL_EETQ" == "true" ]; then \
EXTRA_PACKAGES="${EXTRA_PACKAGES},eetq"; \ EXTRA_PACKAGES="${EXTRA_PACKAGES},eetq"; \
fi; \ fi; \
pip install -e ".[$EXTRA_PACKAGES]" if [ -n "$HTTP_PROXY" ]; then \
pip install --proxy=$HTTP_PROXY -e ".[$EXTRA_PACKAGES]"; \
else \
pip install -e ".[$EXTRA_PACKAGES]"; \
fi
# Rebuild flash attention # Rebuild flash attention
RUN pip uninstall -y transformer-engine flash-attn && \ RUN pip uninstall -y transformer-engine flash-attn && \
if [ "$INSTALL_FLASHATTN" == "true" ]; then \ if [ "$INSTALL_FLASHATTN" == "true" ]; then \
pip uninstall -y ninja && pip install ninja && \ pip uninstall -y ninja && \
pip install --no-cache-dir flash-attn --no-build-isolation; \ if [ -n "$HTTP_PROXY" ]; then \
pip install --proxy=$HTTP_PROXY ninja && \
pip install --proxy=$HTTP_PROXY --no-cache-dir flash-attn --no-build-isolation; \
else \
pip install ninja && \
pip install --no-cache-dir flash-attn --no-build-isolation; \
fi; \
fi
RUN if [ -n "$HTTP_PROXY" ]; then \
unset http_proxy; \
unset https_proxy; \
fi fi
# Set up volumes # Set up volumes