Browse Source

Merge pull request #1053 from dynport/do-not-copy-hostname-from-image

do not merge hostname from image
Guillaume J. Charmes 12 years ago
parent
commit
16c8a10ef9
1 changed files with 0 additions and 3 deletions
  1. 0 3
      utils.go

+ 0 - 3
utils.go

@@ -53,9 +53,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
 	}