kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Actually use the mergeConfig function

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-01 11:22:06 -07:00
parent ae97477284
commit 7ff65d40d5
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
runtime.go
View file

@ -121,9 +121,8 @@ func (runtime *Runtime) Create(config *Config) (*Container, error) {
return nil, err return nil, err
} }
//runtime.mergeConfig(config, img.Config)
if img.Config != nil { if img.Config != nil {
config = img.Config runtime.mergeConfig(config, img.Config)
} }
if config.Cmd == nil { if config.Cmd == nil {