openstack/kolla-ansible
Code Issues Proposed changes

Merge "Regression: git is required to build from source on ubuntu"

Browse Source
This commit is contained in:
Jenkins 2015-09-21 14:12:14 +00:00 committed by Gerrit Code Review
commit cde1d73aeb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/kolla-ansible/Dockerfile.j2
View File

@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ RUN yum -y install \
git \
gcc \ gcc \
libffi-devel \ libffi-devel \
libxml2-devel \ libxml2-devel \
@ -16,11 +15,6 @@ RUN yum -y install \
RUN pip install -U pip wheel 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 %} {% endif %}
RUN pip --no-cache-dir install shade RUN pip --no-cache-dir install shade

1
docker/openstack-base/Dockerfile.j2
View File

@ -15,6 +15,7 @@ RUN apt-get install -y --no-install-recommends \
libffi-dev \ libffi-dev \
libyaml-dev \ libyaml-dev \
pkg-config \ pkg-config \
git \
&& apt-get clean && apt-get clean
{% endif %} {% endif %}