toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3880 from vieux/fix_docker_login

Browse Source 
fix docker login
Upstream-commit: 87c14039481e69add8c1cc2be70c41e23b6a8d31
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-01-31 17:31:27 -08:00
parent 1ec7d7b519 c7f2da1d18
commit 85b3df31cc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/commands.go
View File

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