From 6a84d2ec5aa0a41090c625cd88c54b9212b7caa2b9e1e1b1a17e041f7cfa3df6 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Tue, 1 Mar 2016 18:22:19 +0000 Subject: [PATCH] - fix bsc#968972 - let docker manage the cgroups of the processes that it launches without systemd OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=78 --- docker.changes | 6 ++++++ docker.service | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/docker.changes b/docker.changes index 5afbaa3..a789104 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 1 17:54:41 UTC 2016 - jmassaguerpla@suse.com + +- fix bsc#968972 - let docker manage the cgroups of the processes + that it launches without systemd + ------------------------------------------------------------------- Tue Mar 1 15:28:56 UTC 2016 - jmassaguerpla@suse.com diff --git a/docker.service b/docker.service index 013ea44..6177c84 100644 --- a/docker.service +++ b/docker.service @@ -5,12 +5,17 @@ After=network.target docker.socket Requires=docker.socket [Service] +# the default is not to use systemd for cgroups because the delegate issues still +# exists and systemd currently does not support the cgroup feature set required +# for containers run by docker EnvironmentFile=/etc/sysconfig/docker ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS MountFlags=slave LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity +# set delegate yes so that systemd does not reset the cgroups of docker containers +Delegate=yes [Install] WantedBy=multi-user.target