Accepting request 652641 from home:cyphar:containers:docker_18.09

- Update docker.service to match upstream and avoid rlimit problems.
  bsc#1112980

OBS-URL: https://build.opensuse.org/request/show/652641
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=272
This commit is contained in:
2018-11-29 15:21:51 +00:00
committed by Git OBS Bridge
parent 4bdf0ab402
commit 51f454aa26
2 changed files with 11 additions and 5 deletions

View File

@@ -15,7 +15,7 @@ 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
LimitNOFILE=1048576
LimitNPROC=infinity
LimitCORE=infinity
@@ -27,9 +27,13 @@ TasksMax=infinity
# Only systemd 218 and above support this property.
Delegate=yes
# This is not necessary because of how we set up containerd.
#KillMode=process
# Kill only the docker process, not all processes in the cgroup.
KillMode=process
# Restart the docker process if it exits prematurely.
Restart=on-failure
StartLimitBurst=3
StartLimitInterval=60s
[Install]
WantedBy=multi-user.target