Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-09-20 02:30:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151 from jam7/fix-pip

Browse Source 
linux-*: Change common.docker to fix pip installation.
This commit is contained in:
Matt McCormick 2017-06-10 18:07:17 -07:00 committed by GitHub
commit 2b28515daf
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common.docker
View File

@ -28,7 +28,15 @@ 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 $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") -m pip install conan 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 --ignore-installed && \
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 --ignore-installed conan
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
WORKDIR /work WORKDIR /work