do not merge hostname from image

Upstream-commit: 9bfec5a5389207cba4cdbdd7eafc692c65278ce0 Component: engine
2013-06-28 15:22:01 +02:00
parent ad4f82e6d2
commit 865986c53d
1 changed files with 0 additions and 3 deletions
--- a/components/engine/utils.go
+++ b/components/engine/utils.go
@ -49,9 +49,6 @@ func CompareConfig(a, b *Config) bool {
 }

 func MergeConfig(userConf, imageConf *Config) {
-	if userConf.Hostname == "" {
-		userConf.Hostname = imageConf.Hostname
-	}
 	if userConf.User == "" {
 		userConf.User = imageConf.User
 	}