vbatts
/
containerd
1
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #673 from AkihiroSuda/run-revive-cmd 

ctr/run: revive specifying custom command
This commit is contained in:
Stephen Day 2017-03-31 14:14:39 -07:00 committed by GitHub
parent 1a983cf749 71870d7631
commit 45cdc51a09
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/ctr/run.go
View File

@ -51,8 +51,13 @@ func spec(id string, config *ocispec.ImageConfig, context *cli.Context) (*specs.
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
} }
env = append(env, config.Env...) env = append(env, config.Env...)
cmd := config.Cmd
if v := context.Args().Tail(); len(v) > 0 {
cmd = v
}
var ( var (
args = append(config.Entrypoint, config.Cmd...) // TODO: support overriding entrypoint
args = append(config.Entrypoint, cmd...)
tty = context.Bool("tty") tty = context.Bool("tty")
uid, gid uint32 uid, gid uint32
) )
@ -214,8 +219,9 @@ func spec(id string, config *ocispec.ImageConfig, context *cli.Context) (*specs.
} }
var runCommand = cli.Command{ var runCommand = cli.Command{
Name: "run", Name: "run",
Usage: "run a container", Usage: "run a container",
ArgsUsage: "IMAGE [COMMAND] [ARG...]",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "id", Name: "id",