Increase containerd start-timeout to 2 minutes

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 4251e1e99e16ff7ff5557ee16e5bef26a14cd127)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 64a91ee74e73c956e92801447ae73ba82d168ed5
Component: engine
This commit is contained in:
Kenfe-Mickael Laventure
2016-06-10 16:22:19 +02:00
committed by Sebastiaan van Stijn
parent 35f940a3e5
commit 743a9e8b07
@@ -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 {