Merge pull request #2828 from jterry75/ctr_isolation

Move ctr run --isolation to Windows only

cmd/ctr/commands/run/run.go

@@ -106,15 +106,11 @@ var Command = cli.Command{
 			Name:  "fifo-dir",
 			Usage: "directory used for storing IO FIFOs",
 		},
-		cli.BoolFlag{
-			Name:  "isolated",
-			Usage: "run the container with vm isolation",
-		},
 		cli.StringFlag{
 			Name:  "cgroup",
 			Usage: "cgroup path (To disable use of cgroup, set to \"\" explicitly)",
 		},
-	}, append(commands.SnapshotterFlags, commands.ContainerFlags...)...),
+	}, append(platformRunFlags, append(commands.SnapshotterFlags, commands.ContainerFlags...)...)...),
 	Action: func(context *cli.Context) error {
 		var (
 			err error

cmd/ctr/commands/run/run_unix.go

@@ -32,6 +32,8 @@ import (
 	"github.com/urfave/cli"
 )
 
+var platformRunFlags []cli.Flag
+
 // NewContainer creates a new container
 func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli.Context) (containerd.Container, error) {
 	var (

cmd/ctr/commands/run/run_windows.go

@@ -29,6 +29,13 @@ import (
 	"github.com/urfave/cli"
 )
 
+var platformRunFlags = []cli.Flag{
+	cli.BoolFlag{
+		Name:  "isolated",
+		Usage: "run the container with vm isolation",
+	},
+}
+
 // NewContainer creates a new container
 func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli.Context) (containerd.Container, error) {
 	var (