SHA256
1
0
forked from pool/docker

Accepting request 406751 from home:cyphar:branches:Virtualization:containers

This fixes up a few things, including bnc#983015. Delegate and TaskMax are commented out for documentation purposes.

OBS-URL: https://build.opensuse.org/request/show/406751
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=114
This commit is contained in:
Christian Brauner
2016-07-05 14:37:24 +00:00
committed by Git OBS Bridge
parent fb808759db
commit b2da1ef3a2
2 changed files with 19 additions and 3 deletions

View File

@@ -7,10 +7,19 @@ Requires=docker.socket containerd.socket
[Service]
EnvironmentFile=/etc/sysconfig/docker
ExecStart=/usr/bin/docker daemon -H fd:// --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
LimitNOFILE=1048576
LimitNPROC=1048576
ExecReload=/bin/kill -s HUP $MAINPID
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
LimitNOFILE=infinity
LimitNPROC=infinity
LimitCORE=infinity
# Uncomment TasksMax if your systemd version supports it.
# Only systemd 226 and above support this version.
#TasksMax=infinity
# Set delegate yes so that systemd does not reset the cgroups of docker containers
Delegate=yes
# Kill only the docker process, not all processes in the cgroup
KillMode=process
[Install]
WantedBy=multi-user.target