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

Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout

Browse source 
(cherry-pick) Increase containerd start-timeout to 2 minutes on master
This commit is contained in:
Sebastiaan van Stijn 2016-06-10 23:21:52 +02:00 • committed by GitHub
commit a1f60b9db3
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libcontainerd/remote_linux.go
View file

@ -357,6 +357,7 @@ func (r *remote) runContainerdDaemon() error {
"--shim", "docker-containerd-shim",
"--runtime", "docker-runc",
"--metrics-interval=0",
"--start-timeout", "2m",
"--state-dir", filepath.Join(r.stateDir, containerdStateDir),
}
if r.debugLog {