diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2015-12-16 12:41:59 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2015-12-16 12:41:59 +0800 |
| commit | b35ba2b1b1b1690867870a6bd3a1925bbada844b (patch) | |
| tree | 45267d68f68b20557b9dfc10a10a933677361b08 | |
| parent | 6c4ba7e7e5d36665352178883f7924b0ff7bd30d (diff) | |
| download | kolla-b35ba2b1b1b1690867870a6bd3a1925bbada844b.tar.gz kolla-b35ba2b1b1b1690867870a6bd3a1925bbada844b.zip | |
do not replace the systemd-container with systemd
Systemd-container no longer exist in centos latest docker image.
Change-Id: Icbfc7fce99885551f7f4caa707a600b20db849ae
Closes-Bug: #1526606
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 11b4a89e9..4d1270b9e 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 %} |