1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

do not merge hostname from image

This commit is contained in:
Tobias Schwab 2013-06-28 15:22:01 +02:00
parent a11fc9f067
commit 9bfec5a538

View file

@ -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
}