Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] disable containerd CRI plugin #29

Merged
merged 1 commit into from
Aug 7, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libcontainerd/remote_daemon_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down