diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-14 18:01:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-14 18:01:57 +0000 |
| commit | aa5dba96da5a5e5a9ebda4afbcb428c6b5760d59 (patch) | |
| tree | c9cd54a3fdd9515d7927ce1215b53c24aeed2a01 | |
| parent | 005e4293e3dddd90cf46a3a2730ad40a4c3bbba3 (diff) | |
| parent | f4319a9a2158256e2b867b732e29c4ed421b2004 (diff) | |
| download | kolla-aa5dba96da5a5e5a9ebda4afbcb428c6b5760d59.tar.gz kolla-aa5dba96da5a5e5a9ebda4afbcb428c6b5760d59.zip | |
Merge "CentOS 7.1 image doesn't work with libvirt"
| -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 |