openstack/kolla-ansible
Code Issues Proposed changes

Update EPEL version in base

Browse Source 
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
This commit is contained in:
Andrew Widdersheim 2016-09-19 18:30:38 -04:00
parent 1863399686
commit ccc68d78e1
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

@ -104,7 +104,7 @@ RUN true \
# Enable couple required repositories for all RHEL builds # Enable couple required repositories for all RHEL builds
# Turn on EPEL throughout the build # Turn on EPEL throughout the build
RUN yum -y install \ 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 \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum -y install \ && yum -y install \
yum-plugin-priorities \ yum-plugin-priorities \
@ -122,7 +122,7 @@ COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
RUN yum -y install \ RUN yum -y install \
tar \ tar \
yum-utils \ 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 \ && rpm -Uvh --nodeps \
http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-mitaka/centos-release-openstack-mitaka-1-3.el7.noarch.rpm \ 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 \ http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-jewel-1.0-1.el7.centos.noarch.rpm \