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

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

Browse source 
ctr/run: revive specifying custom command
This commit is contained in:
Stephen Day 2017-03-31 14:14:39 -07:00 committed by GitHub
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",
}
env = append(env, config.Env...)
cmd := config.Cmd
if v := context.Args().Tail(); len(v) > 0 {
cmd = v
}
var (
args = append(config.Entrypoint, config.Cmd...)
// TODO: support overriding entrypoint
args = append(config.Entrypoint, cmd...)
tty = context.Bool("tty")
uid, gid uint32
)
@ -214,8 +219,9 @@ func spec(id string, config *ocispec.ImageConfig, context *cli.Context) (*specs.
}
var runCommand = cli.Command{
Name: "run",
Usage: "run a container",
Name: "run",
Usage: "run a container",
ArgsUsage: "IMAGE [COMMAND] [ARG...]",
Flags: []cli.Flag{
cli.StringFlag{
Name: "id",