knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: try empyt crets as last resort (#1100) 

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2022-07-08 18:30:08 +02:00 committed by GitHub
parent afd224fe5c
commit f0a33bd6bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/creds/credentials.go
View File

@ -189,9 +189,6 @@ func NewCredentialsProvider(opts ...Opt) docker.CredentialsProvider {
dockerConfigPath := filepath.Join(home, ".docker", "config.json") dockerConfigPath := filepath.Join(home, ".docker", "config.json")
var defaultCredentialLoaders = []CredentialsCallback{ var defaultCredentialLoaders = []CredentialsCallback{
func(registry string) (docker.Credentials, error) { // empty credentials provider for unsecured registries
return docker.Credentials{}, nil
},
func(registry string) (docker.Credentials, error) { func(registry string) (docker.Credentials, error) {
creds, err := config.GetCredentials(sys, registry) creds, err := config.GetCredentials(sys, registry)
if err != nil { if err != nil {
@ -208,6 +205,9 @@ func NewCredentialsProvider(opts ...Opt) docker.CredentialsProvider {
func(registry string) (docker.Credentials, error) { func(registry string) (docker.Credentials, error) {
return getCredentialsByCredentialHelper(dockerConfigPath, registry) return getCredentialsByCredentialHelper(dockerConfigPath, registry)
}, },
func(registry string) (docker.Credentials, error) { // empty credentials provider for unsecured registries
return docker.Credentials{}, nil
},
} }
c.credentialLoaders = append(c.credentialLoaders, defaultCredentialLoaders...) c.credentialLoaders = append(c.credentialLoaders, defaultCredentialLoaders...)