0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Read the stdin line properly.

Browse source 
Load the auth config before it's used.
This commit is contained in:
David Calavera 2013-09-01 16:12:07 -07:00
parent 35fef275b3
commit ce53e21ea6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands.go
View file

@ -277,14 +277,15 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
readInput := func(in io.Reader, out io.Writer) string { readInput := func(in io.Reader, out io.Writer) string {
reader := bufio.NewReader(in) reader := bufio.NewReader(in)
line, err := reader.ReadString('\n') line, _, err := reader.ReadLine()
if err != nil { if err != nil {
fmt.Fprintln(out, err.Error()) fmt.Fprintln(out, err.Error())
os.Exit(1) os.Exit(1)
} }
return line return string(line)
} }
cli.LoadConfigFile()
authconfig, ok := cli.configFile.Configs[auth.IndexServerAddress()] authconfig, ok := cli.configFile.Configs[auth.IndexServerAddress()]
if !ok { if !ok {
authconfig = auth.AuthConfig{} authconfig = auth.AuthConfig{}