From f79fc0f81ebb65581641265fb51608c863e3e2d0 Mon Sep 17 00:00:00 2001 From: Krasi Georgiev Date: Wed, 15 Feb 2017 21:43:01 +0200 Subject: [PATCH] ignore registry url from user when it is the default namespace Signed-off-by: Krasi Georgiev Upstream-commit: 1d0e556669544bf38f50cc98a00cfac64cdc418f Component: cli --- components/cli/command/registry/login.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/cli/command/registry/login.go b/components/cli/command/registry/login.go index bdcc9a103b..ee4fd97f11 100644 --- a/components/cli/command/registry/login.go +++ b/components/cli/command/registry/login.go @@ -7,6 +7,7 @@ import ( "github.com/docker/docker/cli" "github.com/docker/docker/cli/command" + "github.com/docker/docker/registry" "github.com/spf13/cobra" ) @@ -49,7 +50,7 @@ func runLogin(dockerCli *command.DockerCli, opts loginOptions) error { serverAddress string authServer = command.ElectAuthServer(ctx, dockerCli) ) - if opts.serverAddress != "" { + if opts.serverAddress != "" && opts.serverAddress != registry.DefaultNamespace { serverAddress = opts.serverAddress } else { serverAddress = authServer