diff options
| author | Sean Mooney <sean.k.mooney@intel.com> | 2015-09-16 21:19:25 +0100 |
|---|---|---|
| committer | Sean Mooney <sean.k.mooney@intel.com> | 2015-09-17 07:58:28 +0100 |
| commit | a242b51bbc80c1753398a64504bf8a52b2908bfe (patch) | |
| tree | 2feb4aba7025a2a87f6f38b6895c24ba5989ba44 | |
| parent | 7088e885f82144a23df56faa1e0c7d75f29de071 (diff) | |
| download | kolla-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
| -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 %} |