From d0707f6b8c0fbca951a8239753379daef643827a 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 Upstream-commit: 9c765040a5638429384b56a1b77139c6d4049c75 Component: engine --- components/engine/api/client/login.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/engine/api/client/login.go b/components/engine/api/client/login.go index 3fb20da1a5..e941a14efe 100644 --- a/components/engine/api/client/login.go +++ b/components/engine/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)