diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-08-19 16:58:12 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-08-19 16:58:12 +0000 |
| commit | 8cf4ffa22f1a1a20d2f2adf659d300c7df3d37ba (patch) | |
| tree | e7f59c4ea8f928fc763ec9bf5920ec71a34341ee /docker_templates/base | |
| parent | f17c1beba8b28041725f7ab49db9aad7786b0ef0 (diff) | |
| download | kolla-8cf4ffa22f1a1a20d2f2adf659d300c7df3d37ba.tar.gz kolla-8cf4ffa22f1a1a20d2f2adf659d300c7df3d37ba.zip | |
Fix binary builds for oraclelinux templates
* Enable some extra repos for oraclelinux in the base template.
* Disable magnum binary builds for oraclelinux due to unavailable
python-docker-py dependency
Change-Id: Iaf8826dc0f9ff93a40e5ad3d1c0fd1fb6ef2e048
Closes-Bug: 1486636
Diffstat (limited to 'docker_templates/base')
| -rw-r--r-- | docker_templates/base/Dockerfile.j2 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2 index fb7ff4f62..c185b2553 100644 --- a/docker_templates/base/Dockerfile.j2 +++ b/docker_templates/base/Dockerfile.j2 @@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} {% if install_type == 'binary' %} - {% if base_distro == 'centos' %} + {% if base_distro in ['centos', 'oraclelinux'] %} # Set up repositories # This repository provides all dependencies used by RDO OpenStack @@ -15,13 +15,23 @@ RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.r # This repository turns off auth in PAM so we can operate on Ubuntu 14.04 RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo +{% if base_distro == 'centos' %} # CentOS 7.1 workaround for conflicting packages with libvirt 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 clean all +{% endif %} + +{% if base_distro == 'oraclelinux' %} +RUN yum install -y \ + yum-utils \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ + && yum clean all +RUN yum-config-manager --enable ol7_optional_latest ol7_addons +{% endif %} - # Endif for base_distro centos + # Endif for base_distro centos/oraclelinux {% elif base_distro == 'fedora' %} # Set up repositories |