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

Merge pull request #4042 from crosbymichael/allow-empty-cmd 

Improve no command handling
This commit is contained in:
Guillaume J. Charmes 2014-02-10 11:53:14 -08:00
parent 66f639e8a6 4482115840
commit b42e669a19
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime.go
View File

@ -378,9 +378,7 @@ func (runtime *Runtime) Create(config *Config, name string) (*Container, []strin
} }
} }
if len(config.Entrypoint) != 0 && config.Cmd == nil { if len(config.Entrypoint) == 0 && len(config.Cmd) == 0 {
config.Cmd = []string{}
} else if config.Cmd == nil || len(config.Cmd) == 0 {
return nil, nil, fmt.Errorf("No command specified") return nil, nil, fmt.Errorf("No command specified")
} }