From 65edfbfd1c4468a13ecba279fb8c3079768a2c7a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 26 Aug 2022 11:26:54 +0200 Subject: [PATCH] RegistryAuthenticationPrivilegedFunc: inline GetAuthConfigKey Signed-off-by: Sebastiaan van Stijn --- cli/command/registry.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cli/command/registry.go b/cli/command/registry.go index 94b0c4171a5b..8933f10d3e6f 100644 --- a/cli/command/registry.go +++ b/cli/command/registry.go @@ -41,7 +41,10 @@ func EncodeAuthToBase64(authConfig types.AuthConfig) (string, error) { func RegistryAuthenticationPrivilegedFunc(cli Cli, index *registrytypes.IndexInfo, cmdName string) types.RequestPrivilegeFunc { return func() (string, error) { fmt.Fprintf(cli.Out(), "\nPlease login prior to %s:\n", cmdName) - indexServer := registry.GetAuthConfigKey(index) + indexServer := index.Name + if index.Official { + indexServer = registry.IndexServer + } isDefaultRegistry := indexServer == registry.IndexServer authConfig, err := GetDefaultAuthConfig(cli, true, indexServer, isDefaultRegistry) if err != nil {