Merge pull request #3485 from Random-Liu/fix-containerd-on-windows

dmcgowan · web-flow · commit ca2463a7196a · 2019-08-04T23:04:51.000-07:00
Fix containerd on windows.
diff --git a/services/tasks/local_unix.go b/services/tasks/local_unix.go
@@ -1,3 +1,5 @@
+// +build !windows
+
 /*
    Copyright The containerd Authors.
 
diff --git a/services/tasks/local_windows.go b/services/tasks/local_windows.go
@@ -1,4 +1,4 @@
-// +build ignore
+// +build windows
 
 /*
    Copyright The containerd Authors.
@@ -23,8 +23,6 @@ import (
 	"github.com/containerd/containerd/runtime"
 )
 
-// TODO: JTERRY75 - When Windows V1 runtime is removed change this to only build
-// on Windows.
 var tasksServiceRequires = []plugin.Type{
 	plugin.RuntimePluginV2,
 	plugin.MetadataPlugin,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// +build !windows`
	`2`	`+`
`1`	`3`	`/*`
`2`	`4`	`Copyright The containerd Authors.`
`3`	`5`