docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code 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
parent 12970bef34 64a91ee74e
commit a1f60b9db3
1 changed files with 1 additions and 0 deletions
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 {