docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3880 from vieux/fix_docker_login 

fix docker login
This commit is contained in:
Guillaume J. Charmes 2014-01-31 17:31:27 -08:00
parent 31ee45e6ae d22a39db26
commit 87c1403948
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commands.go
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