github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2793 from lifubang/runexecflag

Browse Source 
fix container cmd args may parsed as ctr args
This commit is contained in:
Michael Crosby 2018-12-04 11:05:51 -05:00 committed by GitHub
commit 4a8acf54b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/ctr/commands/run/run.go
View File

@ -86,9 +86,10 @@ func parseMountFlag(m string) (specs.Mount, error) {
// Command runs a container // Command runs a container
var Command = cli.Command{ var Command = cli.Command{
Name: "run", Name: "run",
Usage: "run a container", Usage: "run a container",
ArgsUsage: "[flags] Image|RootFS ID [COMMAND] [ARG...]", ArgsUsage: "[flags] Image|RootFS ID [COMMAND] [ARG...]",
SkipArgReorder: true,
Flags: append([]cli.Flag{ Flags: append([]cli.Flag{
cli.BoolFlag{ cli.BoolFlag{
Name: "rm", Name: "rm",

7
cmd/ctr/commands/tasks/exec.go
View File

@ -28,9 +28,10 @@ import (
//TODO:(jessvalarezo) exec-id is optional here, update to required arg //TODO:(jessvalarezo) exec-id is optional here, update to required arg
var execCommand = cli.Command{ var execCommand = cli.Command{
Name: "exec", Name: "exec",
Usage: "execute additional processes in an existing container", Usage: "execute additional processes in an existing container",
ArgsUsage: "[flags] CONTAINER CMD [ARG...]", ArgsUsage: "[flags] CONTAINER CMD [ARG...]",
SkipArgReorder: true,
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "cwd", Name: "cwd",