mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
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:
parent
4dbca9eb85
commit
e6b6ef9d68
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user