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

Fix containerd on windows.
2019-08-04 23:04:51 -07:00 · 2019-08-04 23:04:51 -07:00 · ca2463a719
commit ca2463a719
parent f0821348b4 bb99688914
2 changed files with 3 additions and 3 deletions
--- a/services/tasks/local_unix.go
+++ b/services/tasks/local_unix.go
@ -1,3 +1,5 @@
+// +build !windows
+
 /*
   Copyright The containerd Authors.

--- 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,