Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-07-07 01:55:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Centralize python packages installation adding "install-python-packages" script

Browse Source
This commit is contained in:
Jean-Christophe Fillion-Robin
2018-06-06 20:58:31 -04:00
parent 6cdf33f46f
commit 2b93dd5412
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common.docker
View File

@ -13,6 +13,7 @@ COPY \
imagefiles/build-and-install-openssh.sh \
imagefiles/install-cmake-binary.sh \
imagefiles/install-liquidprompt-binary.sh \
imagefiles/install-python-packages.sh \
imagefiles/utils.sh \
/buildscripts/
@ -32,18 +33,10 @@ RUN \
fi; \
/buildscripts/install-liquidprompt-binary.sh && \
PYTHON=$([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
/buildscripts/install-python-packages.sh -python ${PYTHON} && \
/buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
rm -rf /buildscripts \
&& \
${PYTHON} -m pip install --ignore-installed conan
rm -rf /buildscripts
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 \
curl -# -LO https://bootstrap.pypa.io/get-pip.py && \
python get-pip.py --ignore-installed && \
rm get-pip.py || exit 1; \
fi
RUN echo "root:root" | chpasswd
WORKDIR /work