Skip to content

fix: Port #18133 to support Docker config for oras client #25614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frekw wants to merge 1 commit into from
Closed

fix: Port #18133 to support Docker config for oras client #25614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions util/oci/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"oras.land/oras-go/v2/content/file"
"oras.land/oras-go/v2/registry/remote"
"oras.land/oras-go/v2/registry/remote/auth"
"oras.land/oras-go/v2/registry/remote/credentials"
)

var (
Expand Down Expand Up @@ -145,13 +146,24 @@ func NewClientWithLock(repoURL string, creds Creds, repoLock sync.KeyLock, proxy
},
*/
}

credential := auth.StaticCredential(repo.Reference.Registry, auth.Credential{
Username: creds.Username,
Password: creds.Password,
})

// Try to fallback to the environment config, but we shouldn't error if the file is not set
if creds.Username == "" && creds.Password == "" {
store, _ := credentials.NewStoreFromDocker(credentials.StoreOptions{})
if store != nil {
credential = credentials.Credential(store)
}
}

repo.Client = &auth.Client{
Client: client,
Cache: nil,
Credential: auth.StaticCredential(repo.Reference.Registry, auth.Credential{
Username: creds.Username,
Password: creds.Password,
}),
Client: client,
Cache: nil,
Credential: credential,
}

parsed, err := url.Parse(repoURL)
Expand Down
Loading