Remove unnecessary call to /info
Avoid using the `/info` endpoint in the `login` and `logout` workflows when the Registry endpoint is overriden by the user through the command line. Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
This commit is contained in:
parent
0438c9bd3a
commit
e7efe99042
|
@ -35,9 +35,11 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
|
||||||
cli.in = os.Stdin
|
cli.in = os.Stdin
|
||||||
}
|
}
|
||||||
|
|
||||||
serverAddress := cli.electAuthServer()
|
var serverAddress string
|
||||||
if len(cmd.Args()) > 0 {
|
if len(cmd.Args()) > 0 {
|
||||||
serverAddress = cmd.Arg(0)
|
serverAddress = cmd.Arg(0)
|
||||||
|
} else {
|
||||||
|
serverAddress = cli.electAuthServer()
|
||||||
}
|
}
|
||||||
|
|
||||||
authConfig, err := cli.configureAuth(*flUser, *flPassword, *flEmail, serverAddress)
|
authConfig, err := cli.configureAuth(*flUser, *flPassword, *flEmail, serverAddress)
|
||||||
|
|
|
@ -18,9 +18,11 @@ func (cli *DockerCli) CmdLogout(args ...string) error {
|
||||||
|
|
||||||
cmd.ParseFlags(args, true)
|
cmd.ParseFlags(args, true)
|
||||||
|
|
||||||
serverAddress := cli.electAuthServer()
|
var serverAddress string
|
||||||
if len(cmd.Args()) > 0 {
|
if len(cmd.Args()) > 0 {
|
||||||
serverAddress = cmd.Arg(0)
|
serverAddress = cmd.Arg(0)
|
||||||
|
} else {
|
||||||
|
serverAddress = cli.electAuthServer()
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := cli.configFile.AuthConfigs[serverAddress]; !ok {
|
if _, ok := cli.configFile.AuthConfigs[serverAddress]; !ok {
|
||||||
|
|
Loading…
Reference in New Issue