From 66910a76027d3e37b6a96c0bd1106cfd5d27ba40 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 21 Jun 2013 11:06:41 +0300 Subject: [PATCH 1/2] mark command as optional for docker run --- container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.go b/container.go index f60de21bd..f6abf14e6 100644 --- a/container.go +++ b/container.go @@ -76,7 +76,7 @@ type Config struct { } func ParseRun(args []string, capabilities *Capabilities) (*Config, *flag.FlagSet, error) { - cmd := Subcmd("run", "[OPTIONS] IMAGE COMMAND [ARG...]", "Run a command in a new container") + cmd := Subcmd("run", "[OPTIONS] IMAGE [COMMAND] [ARG...]", "Run a command in a new container") if len(args) > 0 && args[0] != "--help" { cmd.SetOutput(ioutil.Discard) } From 6a1279fb90ad33fec05a48529981db7bb093b782 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 21 Jun 2013 11:07:14 +0300 Subject: [PATCH 2/2] docs: mark command as optional for docker run --- docs/sources/commandline/command/run.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/commandline/command/run.rst b/docs/sources/commandline/command/run.rst index d6c9aef31..8227d9f31 100644 --- a/docs/sources/commandline/command/run.rst +++ b/docs/sources/commandline/command/run.rst @@ -8,7 +8,7 @@ :: - Usage: docker run [OPTIONS] IMAGE COMMAND [ARG...] + Usage: docker run [OPTIONS] IMAGE [COMMAND] [ARG...] Run a command in a new container