From bd2a21985cc473c2b36cff5de05e482872bdc79e Mon Sep 17 00:00:00 2001 From: Lifubang Date: Thu, 15 Nov 2018 18:32:04 +0800 Subject: [PATCH] fix container cmd args may parsed as ctr args Signed-off-by: Lifubang --- cmd/ctr/commands/run/run.go | 7 ++++--- cmd/ctr/commands/tasks/exec.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index 5c4861e03..3c9653602 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -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", diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index 98fcb7744..c26f4b621 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -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",