1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

fix docker login

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-02-01 01:14:59 +00:00
parent 23815414ea
commit d22a39db26

View file

@ -336,7 +336,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
authconfig.ServerAddress = serverAddress authconfig.ServerAddress = serverAddress
cli.configFile.Configs[serverAddress] = authconfig cli.configFile.Configs[serverAddress] = authconfig
body, statusCode, err := readBody(cli.call("POST", "/auth", cli.configFile.Configs[serverAddress], false)) stream, statusCode, err := cli.call("POST", "/auth", cli.configFile.Configs[serverAddress], false)
if statusCode == 401 { if statusCode == 401 {
delete(cli.configFile.Configs, serverAddress) delete(cli.configFile.Configs, serverAddress)
auth.SaveConfig(cli.configFile) auth.SaveConfig(cli.configFile)
@ -345,9 +345,8 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
if err != nil { if err != nil {
return err return err
} }
var out2 engine.Env var out2 engine.Env
err = json.Unmarshal(body, &out2) err = out2.Decode(stream)
if err != nil { if err != nil {
cli.configFile, _ = auth.LoadConfig(os.Getenv("HOME")) cli.configFile, _ = auth.LoadConfig(os.Getenv("HOME"))
return err return err