diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-21 14:12:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-21 14:12:14 +0000 |
| commit | cde1d73aeb5455d289d9d0b07ae478e96017bb92 (patch) | |
| tree | e3adc3a2ffaa13ecff5e5ed7c5e96a7567b069c1 /docker | |
| parent | 2ed7846194c00b3ae682ea82e19b9388ff4e2fa8 (diff) | |
| parent | a242b51bbc80c1753398a64504bf8a52b2908bfe (diff) | |
| download | kolla-cde1d73aeb5455d289d9d0b07ae478e96017bb92.tar.gz kolla-cde1d73aeb5455d289d9d0b07ae478e96017bb92.zip | |
Merge "Regression: git is required to build from source on ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-ansible/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index 6238a2f5c..40020107d 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ - git \ gcc \ libffi-devel \ libxml2-devel \ @@ -16,11 +15,6 @@ RUN yum -y install \ RUN pip install -U pip wheel -{% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get install -y --no-install-recommends git \ - && apt-get clean - {% endif %} RUN pip --no-cache-dir install shade 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 %} |