diff options
| author | Steven Dake <stdake@cisco.com> | 2015-04-14 10:54:50 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-04-14 10:56:41 -0700 |
| commit | f4319a9a2158256e2b867b732e29c4ed421b2004 (patch) | |
| tree | 4d4cbf1585d83fd7c2cde5745ba91a5329545438 | |
| parent | 4a23484a96133cf13f8a6399848dccf07f0ea54d (diff) | |
| download | kolla-f4319a9a2158256e2b867b732e29c4ed421b2004.tar.gz kolla-f4319a9a2158256e2b867b732e29c4ed421b2004.zip | |
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
| -rw-r--r-- | docker/centos-rdo-base/Dockerfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 5fa7ab1ab..2b6c1d7f3 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 |