docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils.go
View File

@ -49,9 +49,6 @@ func CompareConfig(a, b *Config) bool {
} }
func MergeConfig(userConf, imageConf *Config) { func MergeConfig(userConf, imageConf *Config) {
if userConf.Hostname == "" {
userConf.Hostname = imageConf.Hostname
}
if userConf.User == "" { if userConf.User == "" {
userConf.User = imageConf.User userConf.User = imageConf.User
} }