openstack
/
kolla
Code Issues Proposed changes

do not replace the systemd-container with systemd 

Systemd-container no longer exist in centos latest docker image.

Change-Id: Icbfc7fce99885551f7f4caa707a600b20db849ae
Closes-Bug: #1526606
This commit is contained in:
Jeffrey Zhang 2015-12-16 12:41:59 +08:00
parent 6c4ba7e7e5
commit b35ba2b1b1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/base/Dockerfile.j2
View File

@ -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 %}