From ade80789b197612a093e1675f510b6ee9db8a234 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 23 Jan 2024 16:31:34 -0800 Subject: [PATCH] Remove walker diff plugin for Windows Signed-off-by: James Sturtevant --- cmd/containerd/builtins/builtins.go | 1 - cmd/containerd/builtins/builtins_freebsd.go | 2 ++ cmd/containerd/builtins/builtins_linux.go | 1 + cmd/containerd/builtins/builtins_unix.go | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 1274f1d16..29dd9a002 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -21,7 +21,6 @@ import ( _ "github.com/containerd/containerd/v2/core/runtime/v2" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" - _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" diff --git a/cmd/containerd/builtins/builtins_freebsd.go b/cmd/containerd/builtins/builtins_freebsd.go index cfc7cb767..88821d3e2 100644 --- a/cmd/containerd/builtins/builtins_freebsd.go +++ b/cmd/containerd/builtins/builtins_freebsd.go @@ -19,3 +19,5 @@ package builtins // Temporarily removed while plugin package is moved, to be added back // before 2.0. //import _ "github.com/containerd/zfs/plugin" + +import _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index bf2d19558..a7a210856 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -20,6 +20,7 @@ import ( _ "github.com/containerd/containerd/v2/core/metrics/cgroups" _ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" + _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go index 27987f4e7..d2f6a4d85 100644 --- a/cmd/containerd/builtins/builtins_unix.go +++ b/cmd/containerd/builtins/builtins_unix.go @@ -19,6 +19,7 @@ package builtins import ( + _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" )