Skip to content

Commit 25ef433

Browse files
committed
Change the priority of pip2 and pip3 installation
test=develop
1 parent 358485d commit 25ef433

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,34 +72,34 @@ RUN apt-get install -y python3 python3-dev python3-pip
7272
# specify sphinx version as 1.5.6 and remove -U option for [pip install -U
7373
# sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
7474
# version(1.7.1 for now), which causes building documentation failed.
75-
RUN easy_install -U pip && \
75+
RUN pip3 install -U wheel && \
76+
pip3 install -U docopt PyYAML sphinx==1.5.6 && \
77+
pip3 install sphinx-rtd-theme==0.1.9 recommonmark
78+
easy_install -U pip && \
7679
pip install -U wheel && \
7780
pip install -U docopt PyYAML sphinx==1.5.6 && \
7881
pip install sphinx-rtd-theme==0.1.9 recommonmark && \
79-
pip3 install -U wheel && \
80-
pip3 install -U docopt PyYAML sphinx==1.5.6 && \
81-
pip3 install sphinx-rtd-theme==0.1.9 recommonmark
8282

83-
RUN pip install pre-commit 'ipython==5.3.0' && \
84-
pip install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
85-
pip install opencv-python && \
86-
pip3 install pre-commit 'ipython==5.3.0' && \
83+
RUN pip3 install pre-commit 'ipython==5.3.0' && \
8784
pip3 install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
8885
pip3 install opencv-python
86+
pip install pre-commit 'ipython==5.3.0' && \
87+
pip install 'ipykernel==4.6.0' 'jupyter==1.0.0' && \
88+
pip install opencv-python && \
8989

9090
#For docstring checker
91-
RUN pip install pylint pytest astroid isort LinkChecker
9291
RUN pip3 install pylint pytest astroid isort
92+
RUN pip install pylint pytest astroid isort LinkChecker
9393

9494
COPY ./python/requirements.txt /root/
95-
RUN pip install -r /root/requirements.txt
9695
RUN pip3 install -r /root/requirements.txt
96+
RUN pip install -r /root/requirements.txt
9797

9898
# To fix https://github.com/PaddlePaddle/Paddle/issues/1954, we use
9999
# the solution in https://urllib3.readthedocs.io/en/latest/user-guide.html#ssl-py2
100100
RUN apt-get install -y libssl-dev libffi-dev
101-
RUN pip install certifi urllib3[secure]
102101
RUN pip3 install certifi urllib3[secure]
102+
RUN pip install certifi urllib3[secure]
103103

104104

105105
# Install woboq_codebrowser to /woboq

0 commit comments

Comments
 (0)