starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases 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
Upstream-commit: 4031d93f61
Component: cli
This commit is contained in:
Akihiro Suda
2017-03-16 13:19:32 +09:00
committed by GitHub
parent 2524c32d21 f79fc0f81e
commit f295088cb4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/cli/command/registry/login.go
+2 -1
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