aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base
diff options
context:
space:
mode:
authorSean Mooney <sean.k.mooney@intel.com>2015-09-16 21:19:25 +0100
committerSean Mooney <sean.k.mooney@intel.com>2015-09-17 07:58:28 +0100
commita242b51bbc80c1753398a64504bf8a52b2908bfe (patch)
tree2feb4aba7025a2a87f6f38b6895c24ba5989ba44 /docker/openstack-base
parent7088e885f82144a23df56faa1e0c7d75f29de071 (diff)
downloadkolla-a242b51bbc80c1753398a64504bf8a52b2908bfe.tar.gz
kolla-a242b51bbc80c1753398a64504bf8a52b2908bfe.zip
Regression: git is required to build from source on ubuntu
- this change fixes a regression of bug/1481560 - this change re-adds git to the openstack base image when building images from source on ubuntu. - removed explicit git install from kolla-ansible Closes-Bug: #1496561 Change-Id: Ia8a125e40bc6510af6d44c5317647be7ce27b0d6
Diffstat (limited to 'docker/openstack-base')
-rw-r--r--docker/openstack-base/Dockerfile.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 1e33530f7..1880512af 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -15,6 +15,7 @@ RUN apt-get install -y --no-install-recommends \
libffi-dev \
libyaml-dev \
pkg-config \
+ git \
&& apt-get clean
{% endif %}