From b7c2a5f9a19bcad9e003c1a51498beeaa20f17fd Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Wed, 1 May 2013 11:22:06 -0700 Subject: [PATCH] Actually use the mergeConfig function Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b Component: engine --- components/engine/runtime.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/engine/runtime.go b/components/engine/runtime.go index 9d2d889e8d..c0502363ef 100644 --- a/components/engine/runtime.go +++ b/components/engine/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 {