docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue #158 (docker crashes when docker run is called with not enough arguments)

This commit is contained in:
shin- 2013-03-25 07:17:11 -07:00
parent a61e68275a
commit c8ca50b483
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
container.go
View File

@ -76,6 +76,15 @@ func ParseRun(args []string) (*Config, error) {
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil, err return nil, err
} }
parsedArgs := cmd.Args()
runCmd := []string{}
image := ""
if len(parsedArgs) >= 1 {
image = cmd.Arg(0)
}
if len(parsedArgs) > 1 {
runCmd = parsedArgs[1:]
}
config := &Config{ config := &Config{
Ports: fl_ports, Ports: fl_ports,
User: *fl_user, User: *fl_user,
@ -84,8 +93,8 @@ func ParseRun(args []string) (*Config, error) {
Memory: *fl_memory, Memory: *fl_memory,
Detach: *fl_detach, Detach: *fl_detach,
Env: fl_env, Env: fl_env,
Cmd: cmd.Args()[1:], Cmd: runCmd,
Image: cmd.Arg(0), Image: image,
} }
return config, nil return config, nil
} }