diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 14:58:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 14:58:15 +0000 |
| commit | 88bdbf8db545e1cbf8bf7b83f1b97abb1023bdec (patch) | |
| tree | 6d612c8b9d4ff8b9585ed1cb874082b230362e35 /docker | |
| parent | 35ea22ee99016328fbe9a68abe946e8087f425a6 (diff) | |
| parent | 360999929d361c5ba8417ee9e9eb25de29671c7f (diff) | |
| download | kolla-88bdbf8db545e1cbf8bf7b83f1b97abb1023bdec.tar.gz kolla-88bdbf8db545e1cbf8bf7b83f1b97abb1023bdec.zip | |
Merge "Add support to the base image for RHEL"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index cd41257f9..71e6edf53 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) ENV KOLLA_BASE_DISTRO {{ base_distro }} ENV KOLLA_INSTALL_TYPE {{ install_type }} -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} # Turns on MariaDB repos throughout the build COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo @@ -15,7 +15,7 @@ RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} # Set up repositories # This repository provides all dependencies used by RDO OpenStack @@ -29,6 +29,7 @@ RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.r RUN rpm -e --nodeps systemd-container systemd-container-libs \ && rpm -e --nodeps yum-plugin-fastestmirror \ && yum -d 10 -y install systemd systemd-libs systemd-devel \ + && yum install -y epel-release \ && yum clean all {% endif %} @@ -40,6 +41,14 @@ RUN yum install -y \ RUN yum-config-manager --enable ol7_optional_latest ol7_addons {% endif %} +{% if base_distro == 'rhel' %} +RUN yum install -y \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ + && subscription-manager repos --enable rhel-7-server-optional-rpms \ + && subscription-manager repos --enable rhel-7-server-extras-rpms \ + && yum clean all +{% endif %} + # Endif for base_distro centos/oraclelinux {% elif base_distro == 'fedora' %} @@ -48,12 +57,10 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ && yum -y install dnf dnf-plugins-core \ && yum clean all - # Endif for base_distro fedora {% endif %} # Update packages RUN yum update -y \ - && yum install -y epel-release \ && yum clean all # Install base packages @@ -171,7 +178,7 @@ RUN yum update -y \ # Endif for install_type source {% endif %} -# Endif for base_distro centos,fedora,oraclelinux +# Endif for base_distro centos,fedora,oraclelinux,rhel {% elif base_distro in ['ubuntu', 'debian'] %} # This will prevent questions from being asked during the install |