Skip to content

Commit 611da71

Browse files
authored
Merge pull request containerd#9680 from jsturtevant/remove-walker-for-windows
Remove walker diff plugin for Windows
2 parents 023ec5e + ade8078 commit 611da71

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

cmd/containerd/builtins/builtins.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
_ "github.com/containerd/containerd/v2/core/runtime/v2"
2222
_ "github.com/containerd/containerd/v2/pkg/events/plugin"
2323
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
24-
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
2524
_ "github.com/containerd/containerd/v2/plugins/gc"
2625
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
2726
_ "github.com/containerd/containerd/v2/plugins/leases"

cmd/containerd/builtins/builtins_freebsd.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ package builtins
1919
// Temporarily removed while plugin package is moved, to be added back
2020
// before 2.0.
2121
//import _ "github.com/containerd/zfs/plugin"
22+
23+
import _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"

cmd/containerd/builtins/builtins_linux.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
2121
_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
2222
_ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
23+
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
2324
_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
2425
_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
2526
_ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"

cmd/containerd/builtins/builtins_unix.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package builtins
2020

2121
import (
22+
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
2223
_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
2324
_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
2425
)

0 commit comments

Comments
 (0)