pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix bsc#968972 - let docker manage the cgroups of the processes

Browse Source 
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:
Jordi Massaguer 2016-03-01 18:22:19 +00:00 committed by Git OBS Bridge
parent 7eeda7063e
commit 6a84d2ec5a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

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

5
docker.service
View File

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