kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

systemd: add "Delegate=yes" to docker's service file

Browse source 
We need to add delegate yes to docker's service file so that it can
manage the cgroups of the processes that it launches without systemd
interfering with them and moving the processes after it is reloaded.

       Delegate=
           Turns on delegation of further resource control partitioning to
           processes of the unit. For unprivileged services (i.e. those
           using the User= setting), this allows processes to create a
           subhierarchy beneath its control group path. For privileged
           services and scopes, this ensures the processes will have all
           control group controllers enabled.

This is the proper fix for issue moby/moby#20152

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2018-08-31 12:53:49 +02:00
parent 7daf2db62a
commit 26eddc16a8
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/init/systemd/docker.service
View file

@ -8,6 +8,10 @@ Wants=network-online.target
[Service] [Service]
# Install containerd-shim-process if it's not already installed # Install containerd-shim-process if it's not already installed
ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process
# 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/dockerd ExecStart=/usr/bin/dockerd
ExecStopPost=/usr/bin/dockerd post-stop ExecStopPost=/usr/bin/dockerd post-stop
TimeoutSec=0 TimeoutSec=0
@ -27,5 +31,8 @@ LimitCORE=infinity
# Only systemd 226 and above support this option. # Only systemd 226 and above support this option.
TasksMax=infinity TasksMax=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