diff --git a/runtime.go b/runtime.go index 16c98117fd..7ad0c395e8 100644 --- a/runtime.go +++ b/runtime.go @@ -80,10 +80,10 @@ func (runtime *Runtime) containerRoot(id string) string { } func (runtime *Runtime) mergeConfig(userConf, imageConf *Config) { - if userConf.Hostname != "" { + if userConf.Hostname == "" { userConf.Hostname = imageConf.Hostname } - if userConf.User != "" { + if userConf.User == "" { userConf.User = imageConf.User } if userConf.Memory == 0 {