aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDavid Moreau Simard <dms@redhat.com>2015-11-26 17:27:34 -0500
committerDavid Moreau Simard <dms@redhat.com>2015-11-27 15:21:58 +0000
commita9d570695adc4ba52310d9bc878e150adf1e447b (patch)
tree4fe3c4bca53779eddc82ac8efdb0cbd366243cd4 /docker
parentdd71b98d81540436fb82ae85e969ea5919ffa9b8 (diff)
downloadkolla-a9d570695adc4ba52310d9bc878e150adf1e447b.tar.gz
kolla-a9d570695adc4ba52310d9bc878e150adf1e447b.zip
Install yum-plugin-priorities on RHEL-derivatives
RDO provides all of the OpenStack services, clients, libs and their dependencies self-contained in it's repositories. We have had users that were impacted by sudden updates from EPEL when it was enabled because EPEL provided a more up-to-date version. Packages may also be found in both the delorean and delorean-deps repositories. yum-plugin-priorities will ensure the right package candidates are chosen for installation. Change-Id: I043ec1f60381dc7f5baab5f320ed5f1edde8ae82 Related-bug: https://bugzilla.redhat.com/show_bug.cgi?id=1284978 Closes-bug: #1520620
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j25
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 0d497b816..3a53cc8b4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -69,7 +69,7 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
RUN rpm -e --nodeps systemd-container systemd-container-libs \
&& rpm -e --nodeps yum-plugin-fastestmirror \
&& yum -y install systemd systemd-libs systemd-devel \
- && yum install -y epel-release \
+ && yum install -y epel-release yum-plugin-priorities \
&& yum clean all
{% endif %}
@@ -81,6 +81,7 @@ RUN rpm -e --nodeps systemd-container systemd-container-libs \
# Turn on EPEL throughout the build
RUN yum install -y \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+ && yum -y install yum-plugin-priorities \
&& yum clean all \
&& yum-config-manager --enable rhel-7-server-optional-rpms \
&& yum-config-manager --enable rhel-7-server-extras-rpms
@@ -95,6 +96,7 @@ RUN yum install -y \
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
+RUN yum install -y yum-plugin-priorities
{% endif %}
# Endif for base_distro oraclelinux
@@ -104,6 +106,7 @@ RUN yum-config-manager --enable ol7_optional_latest ol7_addons
# Set up repositories
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
&& yum -y install dnf dnf-plugins-core \
+ && yum -y install yum-plugin-priorities \
&& yum clean all
{% endif %}