From a58b402fc857dd02dc3bc78e5fb61a34c85846e7 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 5 Nov 2015 14:19:48 -0800 Subject: [PATCH] Windows: Fix docker login Signed-off-by: John Howard (cherry picked from commit 9c765040a5638429384b56a1b77139c6d4049c75) --- api/client/login.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/client/login.go b/api/client/login.go index 3fb20da1a..e941a14ef 100644 --- 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)