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

Fix issue within mergeConfig preventing hostname and user to be set

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-02 12:32:10 -07:00
parent 1617a18258
commit 8378498951
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime.go
View file

@ -80,10 +80,10 @@ func (runtime *Runtime) containerRoot(id string) string {
}
func (runtime *Runtime) 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 {