Merge pull request #2165 from jrydberg/master

- Registry: Use correct auth config when logging in.
Upstream-commit: c978f0fa5cd548fe672aacfc186da15b19ab3ef4
Component: engine

components/engine/commands.go

@@ -303,7 +303,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
 	}
 
 	cli.LoadConfigFile()
-	authconfig, ok := cli.configFile.Configs[auth.IndexServerAddress()]
+	authconfig, ok := cli.configFile.Configs[serverAddress]
 	if !ok {
 		authconfig = auth.AuthConfig{}
 	}