common.docker: Optimize image size installing "liquidprompt" in existing RUN command

This commit is contained in:
Jean-Christophe Fillion-Robin
2018-06-04 23:48:09 -04:00
parent 6ac8097064
commit cb157b7457
3 changed files with 44 additions and 27 deletions

View File

@ -10,6 +10,7 @@ COPY \
imagefiles/build-and-install-openssh.sh \
imagefiles/build-and-install-cmake.sh \
imagefiles/install-cmake-binary.sh \
imagefiles/install-liquidprompt-binary.sh \
imagefiles/build-and-install-curl.sh \
imagefiles/build-and-install-ninja.sh \
/dockcross/
@ -28,6 +29,7 @@ RUN \
/dockcross/build-and-install-git.sh && \
/dockcross/install-cmake-binary.sh || exit 1; \
fi; \
/dockcross/install-liquidprompt-binary.sh && \
PYTHON=$([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
/dockcross/build-and-install-ninja.sh -python ${PYTHON} && \
rm \
@ -37,6 +39,7 @@ RUN \
/dockcross/build-and-install-openssh.sh \
/dockcross/build-and-install-cmake.sh \
/dockcross/install-cmake-binary.sh \
/dockcross/install-liquidprompt-binary.sh \
/dockcross/build-and-install-curl.sh \
/dockcross/build-and-install-ninja.sh \
&& \
@ -54,12 +57,6 @@ RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \
rm get-pip.py || exit 1; \
fi
WORKDIR /usr/share
RUN git clone "https://github.com/nojhan/liquidprompt.git" && \
cd liquidprompt && \
git checkout v_1.11
COPY imagefiles/.bashrc /root/
RUN echo "root:root" | chpasswd
WORKDIR /work
ENTRYPOINT ["/dockcross/entrypoint.sh"]