beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain

Browse source 
fix incorect login client credential save when the registry is the default docker registry
This commit is contained in:
Akihiro Suda 2017-03-16 13:19:32 +09:00 committed by GitHub
commit 87c5f67cfa
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/command/registry/login.go
View file

@ -7,6 +7,7 @@ import (
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
"github.com/docker/docker/registry"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -54,7 +55,7 @@ func runLogin(dockerCli *command.DockerCli, opts loginOptions) error {
serverAddress string serverAddress string
authServer = command.ElectAuthServer(ctx, dockerCli) authServer = command.ElectAuthServer(ctx, dockerCli)
) )
if opts.serverAddress != "" { if opts.serverAddress != "" && opts.serverAddress != registry.DefaultNamespace {
serverAddress = opts.serverAddress serverAddress = opts.serverAddress
} else { } else {
serverAddress = authServer serverAddress = authServer