From 6e2fab11f7f9103e33620221dfd8207580bd32dd Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Wed, 3 Feb 2016 10:30:17 -0800 Subject: [PATCH] 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 Upstream-commit: 243d0d6bbe0376fb43a2718710f31bb068d22168 Component: engine --- components/engine/api/client/login.go | 4 +++- components/engine/api/client/logout.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/engine/api/client/login.go b/components/engine/api/client/login.go index f224ff98b1..18ce831911 100644 --- a/components/engine/api/client/login.go +++ b/components/engine/api/client/login.go @@ -35,9 +35,11 @@ func (cli *DockerCli) CmdLogin(args ...string) error { cli.in = os.Stdin } - serverAddress := cli.electAuthServer() + var serverAddress string if len(cmd.Args()) > 0 { serverAddress = cmd.Arg(0) + } else { + serverAddress = cli.electAuthServer() } authConfig, err := cli.configureAuth(*flUser, *flPassword, *flEmail, serverAddress) diff --git a/components/engine/api/client/logout.go b/components/engine/api/client/logout.go index 556f40faff..f81eb8dd12 100644 --- a/components/engine/api/client/logout.go +++ b/components/engine/api/client/logout.go @@ -18,9 +18,11 @@ func (cli *DockerCli) CmdLogout(args ...string) error { cmd.ParseFlags(args, true) - serverAddress := cli.electAuthServer() + var serverAddress string if len(cmd.Args()) > 0 { serverAddress = cmd.Arg(0) + } else { + serverAddress = cli.electAuthServer() } if _, ok := cli.configFile.AuthConfigs[serverAddress]; !ok {