openstack
/
kolla
Code Issues Proposed changes

Install epel-release-latest rather than certain version 

Install epel-release-latest from fedoraproject.org

Change-Id: Ifb667aaf5184346be70647d9c7574833f526a3cf
Closes-Bug: #1656733
(cherry picked from commit e5c3c4120a)
This commit is contained in:
Jeffrey Zhang 2017-01-16 11:29:46 +08:00 committed by Jeffrey Zhang
parent b10ff6fb4d
commit 1339c20d24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -106,7 +106,7 @@ RUN true \
# Enable couple required repositories for all RHEL builds
# Turn on EPEL throughout the build
RUN yum -y install \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-6.noarch.rpm \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum -y install \
yum-plugin-priorities \
@ -124,7 +124,7 @@ COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
RUN yum -y install \
tar \
yum-utils \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-6.noarch.rpm \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& rpm -Uvh --nodeps \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-openstack-newton-1-1.el7.noarch.rpm \
http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-jewel-1.0-1.el7.centos.noarch.rpm \