diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-07 09:50:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-07 09:50:01 +0000 |
| commit | 998210bcc1507951c6a92aa98e05ed8bb84a963a (patch) | |
| tree | b21d118aadcef3f27246e1aafbb8940fa1e7e8a3 /docker | |
| parent | a38868f9cb33ef66bf376c7e6577a89ebbe95721 (diff) | |
| parent | fbb1842fc8f9c4c418d37d305ea80b3c4130c31c (diff) | |
| download | kolla-998210bcc1507951c6a92aa98e05ed8bb84a963a.tar.gz kolla-998210bcc1507951c6a92aa98e05ed8bb84a963a.zip | |
Merge "Enable source for openstack-base for RPM distros"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 19 |
2 files changed, 21 insertions, 20 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 28924b0d5..d45ce2753 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -140,31 +140,15 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ {% endif %} # Update packages -RUN yum update -y \ - && yum install -y \ - epel-release \ - gcc \ - gcc-c++ \ - git \ - libffi-devel \ - libxml2-devel \ - libxslt-devel \ - mariadb-devel \ - mysql-devel \ - openldap-devel \ - openssl \ - openssl-devel \ - postgresql \ - postgresql-devel \ - python-devel \ - sqlite-devel \ +RUN yum -y install \ + curl \ sudo \ tar \ which \ && yum clean all + # endif for install type is source for RPM based distros {% endif %} - # endif for install type is binary/rhos/rdo for RPM based distros # endif for base_distro centos,fedora,oraclelinux,rhel {% elif base_distro in ['ubuntu', 'debian'] %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3e1350516..f730a2de4 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -38,8 +38,25 @@ RUN yum -y install \ {% endif %} {% elif install_type == 'source' %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + gcc \ + gcc-c++ \ + libffi-devel \ + libxml2-devel \ + libxslt-devel \ + mariadb-devel \ + mysql-devel \ + openldap-devel \ + openssl-devel \ + postgresql \ + postgresql-devel \ + python-devel \ + sqlite-devel \ + && yum clean all - {% if base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ curl \ |