From ccc68d78e1570a2e66ba56b523cf07e780e70cc4 Mon Sep 17 00:00:00 2001
From: Andrew Widdersheim <amwiddersheim@gmail.com>
Date: Mon, 19 Sep 2016 18:30:38 -0400
Subject: [PATCH] Update EPEL version in base
Update to epel-release 7-6. Also, move from HTTPS to HTTP in the RHEL
builds to match what is happening in Oracle Linux. Seems as though HTTPS
does not work any longer.
TrivialFix
Change-Id: Icc457a333acdd5cc5b1e124d4308c4af1eb8d2cc
---
docker/base/Dockerfile.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 4ad44b62b7..ff00365dbd 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -104,7 +104,7 @@ RUN true \
# Enable couple required repositories for all RHEL builds
# Turn on EPEL throughout the build
RUN yum -y install \
- https://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-5.noarch.rpm \
+ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-6.noarch.rpm \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum -y install \
yum-plugin-priorities \
@@ -122,7 +122,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-5.noarch.rpm \
+ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/epel-release-7-6.noarch.rpm \
&& rpm -Uvh --nodeps \
http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.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 \