Browse Source

Actually use the mergeConfig function

Guillaume J. Charmes 12 years ago
parent
commit
7ff65d40d5
1 changed files with 1 additions and 2 deletions
  1. 1 2
      runtime.go

+ 1 - 2
runtime.go

@@ -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 {