From 7c85ed8041184cd916db4719199ba430f157316c Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Thu, 28 Jan 2016 09:49:14 -0800 Subject: [PATCH] Leave git installed in docker builder Downstream agent builders that inherit from this Dockerfile will often need git installed to be able to install hardware managers and such. Removing git and reinstalling it can cause weird apt dependency issues down the line, so leave it installed. Change-Id: I8d5f35d0c8c6a231144a7b0a5b5c8f6d051ab0b1 --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af9840a02..585f2ce83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,9 @@ RUN pip install --no-cache-dir -r /tmp/ironic-python-agent/requirements.txt RUN pip install --no-cache-dir /tmp/ironic-python-agent # Remove no longer needed packages -RUN apt-get -y purge gcc-4.6 gcc python2.7-dev git && \ +# NOTE(jroll) leave git to avoid strange apt issues in downstream Dockerfiles +# that may inherit from this one. +RUN apt-get -y purge gcc-4.6 gcc python2.7-dev && \ apt-get -y autoremove && \ apt-get clean RUN rm -rf /tmp/ironic-python-agent