- 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
This commit is contained in:
parent
7eeda7063e
commit
6a84d2ec5a
@ -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
|
Tue Mar 1 15:28:56 UTC 2016 - jmassaguerpla@suse.com
|
||||||
|
|
||||||
|
@ -5,12 +5,17 @@ After=network.target docker.socket
|
|||||||
Requires=docker.socket
|
Requires=docker.socket
|
||||||
|
|
||||||
[Service]
|
[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
|
EnvironmentFile=/etc/sysconfig/docker
|
||||||
ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
|
ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
|
||||||
MountFlags=slave
|
MountFlags=slave
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
LimitNPROC=1048576
|
LimitNPROC=1048576
|
||||||
LimitCORE=infinity
|
LimitCORE=infinity
|
||||||
|
# set delegate yes so that systemd does not reset the cgroups of docker containers
|
||||||
|
Delegate=yes
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
Loading…
Reference in New Issue
Block a user