diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-29 03:04:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-29 03:04:13 +0000 |
| commit | b0159f7ec9920076df9446e389fbb17875480cde (patch) | |
| tree | 2c7591719b0ca62dffd44cabc60825e12d6ce831 /docker | |
| parent | afb30cbebde5916d6933dab5d5b28a59d8491fda (diff) | |
| parent | a9d570695adc4ba52310d9bc878e150adf1e447b (diff) | |
| download | kolla-b0159f7ec9920076df9446e389fbb17875480cde.tar.gz kolla-b0159f7ec9920076df9446e389fbb17875480cde.zip | |
Merge "Install yum-plugin-priorities on RHEL-derivatives"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 |
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 %} |