openstack/kolla-ansible
Code Issues Proposed changes

Make RHEL build from source

Browse Source 
This patch enables building from source in RHEL.  It works by making
the repositoroies specific to RHEL7 run in either from source or
from binary/rhos builds.

Change-Id: I795284cccc87c4a87d58c93ec73b3f9ea08878f2
Partially-Implements: blueprint rhel-based-image-support
This commit is contained in:
Steven Dake 2015-09-12 07:47:13 -07:00
parent 7740c2aa25
commit 4a79ce4041
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/base/Dockerfile.j2
View File

@ -14,6 +14,15 @@ COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
&& sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo
{% if base_distro == 'rhel' %}
# Turn on EPEL, rhel7-extras, and rhel7-optional throughout all builds for 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 %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
@ -41,14 +50,6 @@ 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' %}