containerd
diff --git a/‎Protobuild.toml‎
Lines changed: 0 additions & 8 deletions b/‎Protobuild.toml‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎client.go‎
Lines changed: 1 addition & 1 deletion b/‎client.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cmd/containerd/builtins_windows.go‎
Lines changed: 0 additions & 1 deletion b/‎cmd/containerd/builtins_windows.go‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎cmd/ctr/commands/commands.go‎
Lines changed: 2 additions & 2 deletions b/‎cmd/ctr/commands/commands.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎container_test.go‎
Lines changed: 4 additions & 12 deletions b/‎container_test.go‎
Lines changed: 4 additions & 12 deletions
diff --git a/‎defaults/defaults_unix.go‎
Lines changed: 2 additions & 0 deletions b/‎defaults/defaults_unix.go‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎defaults/defaults_windows.go‎
Lines changed: 2 additions & 0 deletions b/‎defaults/defaults_windows.go‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎windows/hcsshim.go‎
Lines changed: 0 additions & 166 deletions b/‎windows/hcsshim.go‎
Lines changed: 0 additions & 166 deletions
@@ -77,11 +77,3 @@ ignore_files = [
 	"google/protobuf/descriptor.proto",
 	"gogoproto/gogo.proto"
 ]
-
-[[descriptors]]
-prefix = "github.com/containerd/containerd/windows/hcsshimtypes"
-target = "windows/hcsshimtypes/next.pb.txt"
-ignore_files = [
-	"google/protobuf/descriptor.proto",
-	"gogoproto/gogo.proto"
-]
@@ -93,7 +93,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 	if copts.defaultRuntime != "" {
 		c.runtime = copts.defaultRuntime
 	} else {
-		c.runtime = fmt.Sprintf("%s.%s", plugin.RuntimePlugin, runtime.GOOS)
+		c.runtime = defaults.DefaultRuntime
 	}
 
 	if copts.services != nil {
 
@@ -24,5 +24,4 @@ import (
 	_ "github.com/containerd/containerd/runtime/v2"
 	_ "github.com/containerd/containerd/snapshots/lcow"
 	_ "github.com/containerd/containerd/snapshots/windows"
-	_ "github.com/containerd/containerd/windows"
 )
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 
+	"github.com/containerd/containerd/defaults"
 	"github.com/urfave/cli"
 )
 
@@ -100,7 +100,7 @@ var (
 		cli.StringFlag{
 			Name:  "runtime",
 			Usage: "runtime name",
-			Value: fmt.Sprintf("io.containerd.runtime.v1.%s", runtime.GOOS),
+			Value: defaults.DefaultRuntime,
 		},
 		cli.BoolFlag{
 			Name:  "tty,t",
 
@@ -40,7 +40,6 @@ import (
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/windows/hcsshimtypes"
 	gogotypes "github.com/gogo/protobuf/types"
 )
 
@@ -441,20 +440,13 @@ func TestContainerPids(t *testing.T) {
 		t.Errorf("invalid task pid %d", pid)
 	}
 	processes, err := task.Pids(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
 	switch runtime.GOOS {
 	case "windows":
-		if processes[0].Info == nil {
-			t.Error("expected additional process information but received nil")
-		} else {
-			var details hcsshimtypes.ProcessDetails
-			if err := details.Unmarshal(processes[0].Info.Value); err != nil {
-				t.Errorf("expected Windows info type hcsshimtypes.ProcessDetails %v", err)
-			}
-		}
+		// TODO: This is currently not implemented on windows
 	default:
+		if err != nil {
+			t.Fatal(err)
+		}
 		if l := len(processes); l != 1 {
 			t.Errorf("expected 1 process but received %d", l)
 		}
 
@@ -32,4 +32,6 @@ const (
 	// DefaultFIFODir is the default location used by client-side cio library
 	// to store FIFOs.
 	DefaultFIFODir = "/run/containerd/fifo"
+	// DefaultRuntime is the default linux runtime
+	DefaultRuntime = "io.containerd.runc.v2"
 )
@@ -40,4 +40,6 @@ const (
 	// DefaultFIFODir is the default location used by client-side cio library
 	// to store FIFOs. Unused on Windows.
 	DefaultFIFODir = ""
+	// DefaultRuntime is the default windows runtime
+	DefaultRuntime = "io.containerd.runhcs.v1"
 )
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {`
`93`	`93`	`if copts.defaultRuntime != "" {`
`94`	`94`	`c.runtime = copts.defaultRuntime`
`95`	`95`	`} else {`
`96`		`- c.runtime = fmt.Sprintf("%s.%s", plugin.RuntimePlugin, runtime.GOOS)`
	`96`	`+ c.runtime = defaults.DefaultRuntime`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if copts.services != nil {`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,4 @@ import (`
`24`	`24`	`_ "github.com/containerd/containerd/runtime/v2"`
`25`	`25`	`_ "github.com/containerd/containerd/snapshots/lcow"`
`26`	`26`	`_ "github.com/containerd/containerd/snapshots/windows"`
`27`		`- _ "github.com/containerd/containerd/windows"`
`28`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ const (`
`32`	`32`	`// DefaultFIFODir is the default location used by client-side cio library`
`33`	`33`	`// to store FIFOs.`
`34`	`34`	`DefaultFIFODir = "/run/containerd/fifo"`
	`35`	`+ // DefaultRuntime is the default linux runtime`
	`36`	`+ DefaultRuntime = "io.containerd.runc.v2"`
`35`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,6 @@ const (`
`40`	`40`	`// DefaultFIFODir is the default location used by client-side cio library`
`41`	`41`	`// to store FIFOs. Unused on Windows.`
`42`	`42`	`DefaultFIFODir = ""`
	`43`	`+ // DefaultRuntime is the default windows runtime`
	`44`	`+ DefaultRuntime = "io.containerd.runhcs.v1"`
`43`	`45`	`)`