From b35ba2b1b1b1690867870a6bd3a1925bbada844b Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 16 Dec 2015 12:41:59 +0800
Subject: [PATCH] do not replace the systemd-container with systemd
Systemd-container no longer exist in centos latest docker image.
Change-Id: Icbfc7fce99885551f7f4caa707a600b20db849ae
Closes-Bug: #1526606
---
docker/base/Dockerfile.j2 | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 11b4a89e96..4d1270b9ed 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -65,10 +65,7 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
{% if base_distro == 'centos' %}
-# CentOS 7.1 workaround for conflicting packages with libvirt
-RUN rpm -e --nodeps systemd-container systemd-container-libs \
- && yum -y install systemd systemd-libs systemd-devel \
- && yum install -y epel-release yum-plugin-priorities \
+RUN yum install -y epel-release yum-plugin-priorities \
&& yum clean all
{% endif %}
--
GitLab