Merge pull request #7145 from junnplus/ctr-user

ctr: support --user for run/create

cmd/ctr/commands/commands.go

@@ -205,6 +205,10 @@ var (
 			Name:  "hostname",
 			Usage: "set the container's host name",
 		},
+		cli.StringFlag{
+			Name:  "user,u",
+			Usage: "username or user id, group optional (format: <name|uid>[:<group|gid>])",
+		},
 	}
 )
 

cmd/ctr/commands/run/run_unix.go

@@ -196,6 +196,9 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 		if cwd := context.String("cwd"); cwd != "" {
 			opts = append(opts, oci.WithProcessCwd(cwd))
 		}
+		if user := context.String("user"); user != "" {
+			opts = append(opts, oci.WithUser(user), oci.WithAdditionalGIDs(user))
+		}
 		if context.Bool("tty") {
 			opts = append(opts, oci.WithTTY)
 		}

cmd/ctr/commands/run/run_windows.go

@@ -38,10 +38,6 @@ var platformRunFlags = []cli.Flag{
 		Name:  "isolated",
 		Usage: "run the container with vm isolation",
 	},
-	cli.StringFlag{
-		Name:  "user",
-		Usage: "run the container as the specified user",
-	},
 }
 
 // NewContainer creates a new container
@@ -114,7 +110,7 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 			opts = append(opts, oci.WithProcessCwd(cwd))
 		}
 		if user := context.String("user"); user != "" {
-			opts = append(opts, oci.WithUsername(user))
+			opts = append(opts, oci.WithUser(user))
 		}
 		if context.Bool("tty") {
 			opts = append(opts, oci.WithTTY)