docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity

Fix logic flaw in builder.mergeConfig

Browse Source 
Upstream-commit: 04748a77664c89340b789ef0a25d65b78477dce0
Component: engine
This commit is contained in:
Jonathan Rudenberg
2013-05-15 15:51:04 -04:00
parent 28103013e9
commit ee85b25e45
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/builder.go
View File

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