From e6b6ef9d6829ac143069611f0d6da1f265a246ca Mon Sep 17 00:00:00 2001 From: "Kazushi (Jam) Marukawa" Date: Fri, 9 Jun 2017 21:25:35 +0900 Subject: [PATCH] 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. --- common.docker | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common.docker b/common.docker index e98dca3..d808f8a 100644 --- a/common.docker +++ b/common.docker @@ -28,6 +28,14 @@ RUN \ -python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \ 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 echo "root:root" | chpasswd