Fix logic flaw in builder.mergeConfig

Upstream-commit: 04748a77664c89340b789ef0a25d65b78477dce0 Component: engine
2013-05-15 15:51:04 -04:00
parent 28103013e9
commit ee85b25e45
1 changed files with 1 additions and 1 deletions
--- a/components/engine/builder.go
+++ b/components/engine/builder.go
@ -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