ctr: support --user for run/create

Signed-off-by: Ye Sijun <junnplus@gmail.com>
This commit is contained in:
Ye Sijun 2022-07-08 18:32:35 +08:00
parent 681aaf68b7
commit f77d45e3ba
No known key found for this signature in database
GPG Key ID: 0582626C83FA9CD0
3 changed files with 8 additions and 5 deletions

View File

@ -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>])",
},
}
)

View File

@ -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)
}

View File

@ -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)