Merge pull request moby#17738 from Microsoft/jjh/login

Windows: [TP4] Fix docker login
anthonydahanne · Nov 6, 2015 · f198334 · f198334
2 parents 754c2e0 + 9c76504
commit f198334
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/api/client/login.go b/api/client/login.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"runtime"
 	"strings"
 
 	"github.com/docker/docker/api/types"
@@ -33,6 +34,11 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
 
 	cmd.ParseFlags(args, true)
 
+	// On Windows, force the use of the regular OS stdin stream. Fixes #14336/#14210
+	if runtime.GOOS == "windows" {
+		cli.in = os.Stdin
+	}
+
 	serverAddress := registry.IndexServer
 	if len(cmd.Args()) > 0 {
 		serverAddress = cmd.Arg(0)