aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/kolla-ansible/Dockerfile.j26
-rw-r--r--docker/openstack-base/Dockerfile.j21
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 %}