From 7ed2f5078916c4addd321d12bce49f40bf32680e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 21 Aug 2018 19:42:53 +1000 Subject: [PATCH] 18.06: disable containerd CRI plugin Docker 18.06 does not have a configuration option to disable the CRI plugin, and this plugin is not very useful if containerd is not running standalone. This patch disables the plugin if containerd is running as child-process of dockerd. Signed-off-by: Sebastiaan van Stijn Signed-off-by: Aleksa Sarai --- components/engine/libcontainerd/remote_daemon_linux.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/libcontainerd/remote_daemon_linux.go b/components/engine/libcontainerd/remote_daemon_linux.go index dc59eb8c14f0..34b04e299acd 100644 --- a/components/engine/libcontainerd/remote_daemon_linux.go +++ b/components/engine/libcontainerd/remote_daemon_linux.go @@ -37,6 +37,10 @@ func (r *remote) setDefaults() { if r.snapshotter == "" { r.snapshotter = "overlay" } + // Disable CRI plugin by default if containerd is managed as child-process + // of dockerd. See https://github.com/moby/moby/issues/37507 + r.DisabledPlugins = append(r.DisabledPlugins, "cri") + delete(r.pluginConfs.Plugins, "cri") } func (r *remote) stopDaemon() { -- 2.18.0