Merge pull request #13359 from davidxia/increase-docker-kill-timeout

Increase upstart kill timeout to 20 seconds
2026-09-04 04:31:28 +00:00 · 2015-05-20 11:54:07 -07:00
parent 53a795378d 2f9e7a067a
commit 76a5fb3e1e
1 changed files with 2 additions and 0 deletions
@@ -7,6 +7,8 @@ limit nproc 524288 1048576

 respawn

+kill timeout 20
+
 pre-start script
 	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
 	if grep -v '^#' /etc/fstab | grep -q cgroup \