Merge pull request #17738 from Microsoft/jjh/login

Windows: [TP4] Fix docker login
This commit is contained in:
David Calavera 2015-11-06 15:02:42 -08:00
commit f198334400
1 changed files with 6 additions and 0 deletions

View File

@ -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)