0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Increase upstart kill timeout to 20 seconds
This commit is contained in:
Jessie Frazelle 2015-05-20 11:54:07 -07:00
commit 76a5fb3e1e
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/init/upstart/docker.conf
View file

@ -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 \