From bfde30db98c5d41be19a093f67d00f5c995cb831 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 3 Sep 2015 01:23:45 +0200 Subject: [PATCH] tests: CentOS 7 needs systemd-container It is now needed by the Ceph dependencies and won't work unless the fake version of it is replaced by the actual one. Signed-off-by: Loic Dachary --- src/test/centos-7/Dockerfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/centos-7/Dockerfile.in b/src/test/centos-7/Dockerfile.in index dfde99ae51419..19fe1aa099f00 100644 --- a/src/test/centos-7/Dockerfile.in +++ b/src/test/centos-7/Dockerfile.in @@ -23,7 +23,7 @@ FROM centos:%%os_version%% 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 -- 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 -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* # build dependencies RUN cd /root ; ./install-deps.sh -- 2.47.3