Merge pull request #20633 from crosbymichael/unit-file

Add "Delegate=yes" to docker's service file
Upstream-commit: 6582013207fd7eb7f31b26ecb2516eafb27479a1
Component: engine
This commit is contained in:
Michael Crosby
2016-02-25 10:47:46 -08:00

View File

@ -6,12 +6,17 @@ Requires=docker.socket
[Service]
Type=notify
# 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
ExecStart=/usr/bin/docker daemon -H fd://
MountFlags=slave
LimitNOFILE=1048576
LimitNPROC=1048576
LimitCORE=infinity
TimeoutStartSec=0
# set delegate yes so that systemd does not reset the cgroups of docker containers
Delegate=yes
[Install]
WantedBy=multi-user.target