docker/attest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: drop ACR support for now

Browse Source
This commit is contained in:
mrjoelkamp
2024-06-25 13:44:18 -05:00
parent 13172cb502
commit e37f788865
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/oci/authn.go
View File

@@ -2,7 +2,6 @@ package oci
import ( import (
ecr "github.com/awslabs/amazon-ecr-credential-helper/ecr-login" ecr "github.com/awslabs/amazon-ecr-credential-helper/ecr-login"
acr "github.com/chrismellard/docker-credential-acr-env/pkg/credhelper"
"github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/v1/google" "github.com/google/go-containerregistry/pkg/v1/google"
"github.com/google/go-containerregistry/pkg/v1/remote" "github.com/google/go-containerregistry/pkg/v1/remote"
@@ -13,11 +12,10 @@ func MultiKeychainOption() remote.Option {
} }
func MultiKeychainAll() authn.Keychain { func MultiKeychainAll() authn.Keychain {
// Create a multi-keychain that will use the default Docker, Google, ECR or ACR keychain // Create a multi-keychain that will use the default Docker, Google, or ECR keychain
return authn.NewMultiKeychain( return authn.NewMultiKeychain(
authn.DefaultKeychain, authn.DefaultKeychain,
google.Keychain, google.Keychain,
authn.NewKeychainFromHelper(ecr.NewECRHelper()), authn.NewKeychainFromHelper(ecr.NewECRHelper()),
authn.NewKeychainFromHelper(acr.NewACRCredentialsHelper()),
) )
} }