From 6ac809706420426e292feb877c5ca135473110c8 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 4 Jun 2018 23:35:59 -0400 Subject: [PATCH] common.docker: Optimize image size installing "conan" in existing RUN command --- common.docker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.docker b/common.docker index 51a6377..15a6e1a 100644 --- a/common.docker +++ b/common.docker @@ -38,7 +38,9 @@ RUN \ /dockcross/build-and-install-cmake.sh \ /dockcross/install-cmake-binary.sh \ /dockcross/build-and-install-curl.sh \ - /dockcross/build-and-install-ninja.sh + /dockcross/build-and-install-ninja.sh \ + && \ + ${PYTHON} -m pip install --ignore-installed conan COPY imagefiles/cmake.sh /usr/local/bin/cmake COPY imagefiles/ccmake.sh /usr/local/bin/ccmake @@ -52,8 +54,6 @@ RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \ 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 - WORKDIR /usr/share RUN git clone "https://github.com/nojhan/liquidprompt.git" && \ cd liquidprompt && \