Merge pull request #695 from dtzWill/694-fix-merge-config

- Runtime: utils.go: Fix merge logic for user and hostname.
Upstream-commit: ecb64be6a8c3de7e34b60c266b43a88a9b2124e6
Component: engine

components/engine/utils.go

@@ -49,10 +49,10 @@ func CompareConfig(a, b *Config) bool {
 }
 
 func 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 {