p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Improve no command handling
Upstream-commit: b42e669a190db43c9d9aa7a01153197bf9a1c9ab
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-02-10 11:53:14 -08:00
parent fecffaa7b6 4ce6d81f0d
commit 2b129f1c41
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/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 {
config.Cmd = []string{}
} else if config.Cmd == nil || len(config.Cmd) == 0 {
if len(config.Entrypoint) == 0 && len(config.Cmd) == 0 {
return nil, nil, fmt.Errorf("No command specified")
}