summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Hubbard <bhubbard@redhat.com>2015-12-08 07:05:37 +0100
committerBrad Hubbard <bhubbard@redhat.com>2015-12-08 07:07:38 +0100
commitb47eeae1dacfd530e182859ab3dfaa0ea0dcaf79 (patch)
tree74e0a307321ecfc033dae117da37981a174b118d
parentMerge pull request #6811 from smithfarm/wip-submitting-jewel (diff)
downloadceph-b47eeae1dacfd530e182859ab3dfaa0ea0dcaf79.tar.xz
ceph-b47eeae1dacfd530e182859ab3dfaa0ea0dcaf79.zip
tests: centos7 needs the Continuous Release (CR) Repository enabled for
libunwind Fixes: #13997 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
-rw-r--r--src/test/centos-7/Dockerfile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/centos-7/Dockerfile.in b/src/test/centos-7/Dockerfile.in
index 42810f6795f..7562f860211 100644
--- a/src/test/centos-7/Dockerfile.in
+++ b/src/test/centos-7/Dockerfile.in
@@ -24,7 +24,7 @@ COPY install-deps.sh /root/
COPY ceph.spec.in /root/
# http://jperrin.github.io/centos/2014/09/25/centos-docker-and-systemd/
RUN yum -y swap -- remove fakesystemd systemd-libs systemd-container -- 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 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*
+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* && yum-config-manager --enable cr
# build dependencies
RUN cd /root ; ./install-deps.sh
# development tools