clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files
runtime.go
+1 -2
View File
@@ -121,9 +121,8 @@ func (runtime *Runtime) Create(config *Config) (*Container, error) {
return nil, err
}
//runtime.mergeConfig(config, img.Config)
if img.Config != nil {
config = img.Config
runtime.mergeConfig(config, img.Config)
}
if config.Cmd == nil {