Merge pull request #190 from dotcloud/189-broken_env_tty_mode-fix

#189 Fix the env in TTY mode
Upstream-commit: e260e808149d5ac4d0bfc4822d056a53fb277e66
Component: engine

components/engine/container.go

@@ -258,8 +258,9 @@ func (container *Container) Start() error {
 
 	var err error
 	if container.Config.Tty {
-		container.cmd.Env = append(container.Config.Env,
-			"TERM=xterm",
+		container.cmd.Env = append(
+			[]string{"TERM=xterm"},
+			container.cmd.Env...,
 		)
 		err = container.startPty()
 	} else {