GitList

Browse code

Actually use the mergeConfig function

Guillaume J. Charmes authored on 2013/05/02 03:22:06
Showing 1 changed files

runtime.go index 9d2d889..c050236 100644

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

...	...	@@ -121,9 +121,8 @@ func (runtime Runtime) Create(config Config) (*Container, error) {
121	121	return nil, err
122	122	}
123	123
124		- //runtime.mergeConfig(config, img.Config)
125	124	if img.Config != nil {
126		- config = img.Config
	125	+ runtime.mergeConfig(config, img.Config)
127	126	}
128	127
129	128	if config.Cmd == nil {