Actually use the mergeConfig function

Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b Component: engine
2013-05-01 11:22:06 -07:00
parent c7ffdd6f90
commit b7c2a5f9a1
1 changed files with 1 additions and 2 deletions
@@ -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 {