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

Fix logic flaw in builder.mergeConfig

This commit is contained in:
Jonathan Rudenberg 2013-05-15 15:51:04 -04:00
parent d586662ce5
commit 04748a7766
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder.go
View File

@ -45,7 +45,7 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) {
userConf.PortSpecs = imageConf.PortSpecs userConf.PortSpecs = imageConf.PortSpecs
} }
if !userConf.Tty { if !userConf.Tty {
userConf.Tty = userConf.Tty userConf.Tty = imageConf.Tty
} }
if !userConf.OpenStdin { if !userConf.OpenStdin {
userConf.OpenStdin = imageConf.OpenStdin userConf.OpenStdin = imageConf.OpenStdin