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:
parent
a11fc9f067
commit
9bfec5a538
1 changed files with 0 additions and 3 deletions
3
utils.go
3
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
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue