Change common.docker to fix pip installation for linux-*.

This won't nothing for manylinux-* since pip is installed correctly by manylinux-common/install-python-packages.sh.
This commit is contained in:
Kazushi (Jam) Marukawa 2017-06-09 21:25:35 +09:00
parent 4dbca9eb85
commit e6b6ef9d68

View File

@ -28,6 +28,14 @@ RUN \
-python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \ -python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
rm /dockcross/install-ninja.sh rm /dockcross/install-ninja.sh
RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \
: nothing to do here since it is updated by manylinux-common/install-python-packages.sh ; \
else \
wget https://bootstrap.pypa.io/get-pip.py && \
python get-pip.py && \
rm get-pip.py || exit 1; \
fi
RUN $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") -m pip install conan RUN $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") -m pip install conan
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd