From c7f2da1d1875cb1c3a4d18b230a82ae96d7c9bdb Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Sat, 1 Feb 2014 01:14:59 +0000 Subject: [PATCH] fix docker login Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: d22a39db265dbf68cec4ddbc5903372e936094a9 Component: engine --- components/engine/commands.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index bebab65481..7e512cff26 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -336,7 +336,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error { authconfig.ServerAddress = serverAddress 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 { delete(cli.configFile.Configs, serverAddress) auth.SaveConfig(cli.configFile) @@ -345,9 +345,8 @@ func (cli *DockerCli) CmdLogin(args ...string) error { if err != nil { return err } - var out2 engine.Env - err = json.Unmarshal(body, &out2) + err = out2.Decode(stream) if err != nil { cli.configFile, _ = auth.LoadConfig(os.Getenv("HOME")) return err