tests: reduce centos docker intermediate steps

Collapse multiple RUN statements related to systemd into a single line
to reduce the number of steps that are preserved by docker.

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

diff --git a/src/test/centos/Dockerfile.in b/src/test/centos/Dockerfile.in
index 7b4aa7673d9638997bebdc91dc479fa2e19918f5..4a1784ec682abe7221b2981a6bffc374dc997f70 100644 (file)
--- a/src/test/centos/Dockerfile.in
+++ b/src/test/centos/Dockerfile.in
@@ -22,16 +22,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
-RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done)
-RUN rm -f /lib/systemd/system/multi-user.target.wants/*
-RUN rm -f /etc/systemd/system/*.wants/*
-RUN rm -f /lib/systemd/system/local-fs.target.wants/*
-RUN rm -f /lib/systemd/system/sockets.target.wants/*udev*
-RUN rm -f /lib/systemd/system/sockets.target.wants/*initctl*
-RUN rm -f /lib/systemd/system/basic.target.wants/*
-RUN rm -f /lib/systemd/system/anaconda.target.wants/*
-RUN yum install -y redhat-lsb-core
+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