diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-29 12:27:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-29 12:27:10 +0000 |
| commit | e6a9da202297b0220a6e96ae12ed7c3fbab6e529 (patch) | |
| tree | c6b94219fa75755db4c2fbb974a868804d7898e4 /docker/openstack-base | |
| parent | 8f7006e32350bf290bc9188cd8cf3e4f9c34aea3 (diff) | |
| parent | 571c5bc87881c5326ca02e0e9472c6c15ed390fa (diff) | |
| download | kolla-e6a9da202297b0220a6e96ae12ed7c3fbab6e529.tar.gz kolla-e6a9da202297b0220a6e96ae12ed7c3fbab6e529.zip | |
Merge "Make a openstack-common container for CentOS variants"liberty-rc1
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 6a0604595..3e1350516 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,13 +1,45 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if install_type == 'source' %} +{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} +RUN yum -y install \ + git \ + iproute \ + mariadb-libs \ + MySQL-python \ + openssl \ + patch \ + && yum clean all +{% endif %} + +{% if install_type == 'binary' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} -RUN yum -y install patch \ +RUN yum -y install \ + python-barbicanclient \ + python-ceilometerclient \ + python-congressclient \ + python-designateclient \ + python-heatclient \ + python-ironicclient \ + python-magnumclient \ + python-manilaclient \ + python-mistralclient \ + python-muranoclient \ + python-pip \ + python-saharaclient \ + python-swiftclient \ + python-troveclient \ + python-tuskarclient \ + python-zaqarclient \ + python-openstackclient \ + MySQL-python \ && yum clean all - {% elif base_distro in ['ubuntu', 'debian'] %} + {% endif %} +{% elif install_type == 'source' %} + + {% if base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ curl \ |