Skip to content

Commit 204e338

Browse files
Merge branch 'develop' into develop
2 parents c375ab3 + de20e5a commit 204e338

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

dockerfiles/Dockerfile.gpu

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ COPY . /workspace/FastDeploy
99
RUN echo "ulimit -u unlimited" >> /root/.bashrc
1010
RUN echo "ulimit -n 65536" >> /root/.bashrc
1111

12-
# setting proxy
13-
ARG http_proxy=agent.baidu.com:8891
14-
ARG https_proxy=agent.baidu.com:8891
15-
ARG no_proxy=localhost,bj.bcebos.com,su.bcebos.com,pypi.tuna.tsinghua.edu.cn,paddle-ci.gz.bcebos.com
16-
1712
# uninstall existing package
1813
RUN python -m pip uninstall paddlepaddle-gpu fastdeploy-gpu -y
1914

dockerfiles/Dockerfile.xpu

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy main restricted universe
77
deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-updates main restricted universe multiverse \n\
88
deb https://mirrors.tuna.tsinghua.edu.cn/ubuntu/ jammy-backports main restricted universe multiverse" > /etc/apt/sources.list
99

10-
# setting proxy
11-
ENV http_proxy=http://agent.baidu.com:8891
12-
ENV https_proxy=http://agent.baidu.com:8891
13-
ENV no_proxy=localhost,bj.bcebos.com,su.bcebos.com,pypi.tuna.tsinghua.edu.cn,paddle-ci.gz.bcebos.com
14-
1510
RUN apt-get update && apt-get install -y libibverbs-dev librdmacm-dev cmake pybind11-dev
1611

1712
# uninstall existing package
@@ -40,4 +35,4 @@ COPY . /workspace/FastDeploy
4035
RUN cd /workspace/FastDeploy && bash build.sh && python -m pip install --no-cache-dir dist/* && rm -rf /workspace/FastDeploy
4136

4237
ENV http_proxy=""
43-
ENV https_proxy=""
38+
ENV https_proxy=""

0 commit comments

Comments
 (0)