From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 10 Jan 2015 00:58:54 +0000 (+0100)
Subject: tests: better EPEL installation method
X-Git-Tag: v0.93~188^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a9670c2c35ab0668be55d1a22d3fe41721ddfe3;p=ceph.git

tests: better EPEL installation method

It does not depend on a specific version of the EPEL release package.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/centos/Dockerfile.in b/src/test/centos/Dockerfile.in
index f1989060735f..4e2f5af610f4 100644
--- a/src/test/centos/Dockerfile.in
+++ b/src/test/centos/Dockerfile.in
@@ -23,9 +23,7 @@ FROM centos:%%os_version%%
 COPY install-deps.sh ceph.spec.in /root/
 # http://jperrin.github.io/centos/2014/09/25/centos-docker-and-systemd/
 RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs && (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done) && rm -f /lib/systemd/system/multi-user.target.wants/* && rm -f /etc/systemd/system/*.wants/* && rm -f /lib/systemd/system/local-fs.target.wants/* && rm -f /lib/systemd/system/sockets.target.wants/*udev* && rm -f /lib/systemd/system/sockets.target.wants/*initctl* && rm -f /lib/systemd/system/basic.target.wants/* && rm -f /lib/systemd/system/anaconda.target.wants/* && yum install -y redhat-lsb-core
-RUN yum install -y wget
-RUN wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
-RUN rpm -ivh epel-release-7-5.noarch.rpm
+RUN yum install -y yum-utils && yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/7/x86_64/ && yum install --nogpgcheck -y epel-release && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && rm /etc/yum.repos.d/dl.fedoraproject.org*
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools