From f4319a9a2158256e2b867b732e29c4ed421b2004 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 14 Apr 2015 10:54:50 -0700 Subject: [PATCH] CentOS 7.1 image doesn't work with libvirt The libvirt package has a dependency on systemd-libs and systemd, while the centos 7.1 container installs systemd-container-libs and systemd-container. We don't need either of these systemd tools but they reuslt in a broken build of the system if they are missing. As is, the libvirt container will not build. Change-Id: I8e5aac0e3a7e9d88a81733a3048971fe9d48ba56 --- docker/centos-rdo-base/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 5fa7ab1ab6..2b6c1d7f3e 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -10,6 +10,10 @@ RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdak RUN sed "s/Derived from Red Hat Enterprise Linux 7.1 (Source)/7/" "/etc/yum.repos.d/rdo-release.repo" -i +# CentOS 7.1 workaround for conflicting packages with libvirt +RUN rpm -e --nodeps systemd-container systemd-container-libs +RUN yum -y install systemd systemd-libs systemd-devel && yum clean all + RUN yum install -y epel-release && yum clean all # Update packages