Skip to content

Commit

Permalink
fix: credsStore on macOS
Browse files Browse the repository at this point in the history
Signed-off-by: Matej Vasek <mvasek@redhat.com>
  • Loading branch information
matejvasek committed Mar 15, 2021
1 parent 71dd988 commit 1009379
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkg/docker/config/config.go
Expand Up @@ -26,6 +26,7 @@ type dockerAuthConfig struct {
type dockerConfigFile struct {
AuthConfigs map[string]dockerAuthConfig `json:"auths"`
CredHelpers map[string]string `json:"credHelpers,omitempty"`
CredsStore string `json:"credsStore,omitempty"`
}

type authPath struct {
Expand Down Expand Up @@ -96,7 +97,16 @@ func GetAllCredentials(sys *types.SystemContext) (map[string]types.DockerAuthCon
}

for registry, data := range auths.AuthConfigs {
conf, err := decodeDockerAuth(data)
var conf types.DockerAuthConfig
if data.Auth == "" && auths.CredsStore != "" {
conf.Username, conf.Password, err = getAuthFromCredHelper(auths.CredsStore, registry)
if err != nil && credentials.IsErrCredentialsNotFoundMessage(err.Error()) {
err = nil
}
} else {
conf, err = decodeDockerAuth(data)
}

if err != nil {
return nil, err
}
Expand Down

0 comments on commit 1009379

Please sign in to comment.