Browse Source

Merge pull request #975 from unclejack/891-mark_command_as_optional

891 mark command as optional for docker run
Guillaume J. Charmes 12 years ago
parent
commit
070e1aec7e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      container.go
  2. 1 1
      docs/sources/commandline/command/run.rst

+ 1 - 1
container.go

@@ -76,7 +76,7 @@ type Config struct {
 }
 }
 
 
 func ParseRun(args []string, capabilities *Capabilities) (*Config, *flag.FlagSet, error) {
 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" {
 	if len(args) > 0 && args[0] != "--help" {
 		cmd.SetOutput(ioutil.Discard)
 		cmd.SetOutput(ioutil.Discard)
 	}
 	}

+ 1 - 1
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
     Run a command in a new container