Merge pull request #2793 from lifubang/runexecflag
fix container cmd args may parsed as ctr args
This commit is contained in:
		| @@ -86,9 +86,10 @@ func parseMountFlag(m string) (specs.Mount, error) { | ||||
|  | ||||
| // Command runs a container | ||||
| var Command = cli.Command{ | ||||
| 	Name:      "run", | ||||
| 	Usage:     "run a container", | ||||
| 	ArgsUsage: "[flags] Image|RootFS ID [COMMAND] [ARG...]", | ||||
| 	Name:           "run", | ||||
| 	Usage:          "run a container", | ||||
| 	ArgsUsage:      "[flags] Image|RootFS ID [COMMAND] [ARG...]", | ||||
| 	SkipArgReorder: true, | ||||
| 	Flags: append([]cli.Flag{ | ||||
| 		cli.BoolFlag{ | ||||
| 			Name:  "rm", | ||||
|   | ||||
| @@ -28,9 +28,10 @@ import ( | ||||
|  | ||||
| //TODO:(jessvalarezo) exec-id is optional here, update to required arg | ||||
| var execCommand = cli.Command{ | ||||
| 	Name:      "exec", | ||||
| 	Usage:     "execute additional processes in an existing container", | ||||
| 	ArgsUsage: "[flags] CONTAINER CMD [ARG...]", | ||||
| 	Name:           "exec", | ||||
| 	Usage:          "execute additional processes in an existing container", | ||||
| 	ArgsUsage:      "[flags] CONTAINER CMD [ARG...]", | ||||
| 	SkipArgReorder: true, | ||||
| 	Flags: []cli.Flag{ | ||||
| 		cli.StringFlag{ | ||||
| 			Name:  "cwd", | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Michael Crosby
					Michael Crosby