docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #695 from dtzWill/694-fix-merge-config

Browse Source 
- Runtime: utils.go: Fix merge logic for user and hostname.
Upstream-commit: ecb64be6a8c3de7e34b60c266b43a88a9b2124e6
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-23 16:00:34 -07:00
parent a518559330 ba9a93959a
commit 555e20248f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/utils.go
View File

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