Merge pull request #23072 from dnephin/set_state_dir_of_containerd

Set --state-dir on containerd
Upstream-commit: 1ba9aadbcb8444e4dd70cd83f0d14d7f3c694f10
Component: engine

components/engine/libcontainerd/remote_linux.go

@@ -33,6 +33,7 @@ const (
 	containerdBinary          = "docker-containerd"
 	containerdPidFilename     = "docker-containerd.pid"
 	containerdSockFilename    = "docker-containerd.sock"
+	containerdStateDir        = "containerd"
 	eventTimestampFilename    = "event.ts"
 )
 
@@ -354,6 +355,7 @@ func (r *remote) runContainerdDaemon() error {
 		"--shim", "docker-containerd-shim",
 		"--runtime", "docker-runc",
 		"--metrics-interval=0",
+		"--state-dir", filepath.Join(r.stateDir, containerdStateDir),
 	}
 	if r.debugLog {
 		args = append(args, "--debug")