1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From: Simon Josefsson <simon@josefsson.org>
Subject: [PATCH] Disable credhelper
Origin: vendor
Forwarded: not-needed
Last-Update: 2025-02-05
diff --git a/cmd/cosign/cli/options/registry.go b/cmd/cosign/cli/options/registry.go
index 9d22b4ea..930d402c 100644
--- a/cmd/cosign/cli/options/registry.go
+++ b/cmd/cosign/cli/options/registry.go
@@ -25,13 +25,11 @@ import (
"os"
ecr "github.com/awslabs/amazon-ecr-credential-helper/ecr-login"
- "github.com/chrismellard/docker-credential-acr-env/pkg/credhelper"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/google/go-containerregistry/pkg/authn/github"
"github.com/google/go-containerregistry/pkg/name"
"github.com/google/go-containerregistry/pkg/v1/google"
"github.com/google/go-containerregistry/pkg/v1/remote"
- alibabaacr "github.com/mozillazg/docker-credential-acr-helper/pkg/credhelper"
ociremote "github.com/sigstore/cosign/v2/pkg/oci/remote"
"github.com/spf13/cobra"
)
@@ -136,8 +134,6 @@ func (o *RegistryOptions) GetRegistryClientOpts(ctx context.Context) []remote.Op
authn.DefaultKeychain,
google.Keychain,
authn.NewKeychainFromHelper(ecr.NewECRHelper(ecr.WithLogger(io.Discard))),
- authn.NewKeychainFromHelper(credhelper.NewACRCredentialsHelper()),
- authn.NewKeychainFromHelper(alibabaacr.NewACRHelper().WithLoggerOut(io.Discard)),
github.Keychain,
)
opts = append(opts, remote.WithAuthFromKeychain(kc))
|
