File tree Expand file tree Collapse file tree 6 files changed +16
-8
lines changed Expand file tree Collapse file tree 6 files changed +16
-8
lines changed Original file line number Diff line number Diff line change 55replace github.com/google/go-containerregistry => ../../
66
77require (
8- github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20211215200129-69c85dc22db6
8+ github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220216180153-3d7835abdf40
99 github.com/chrismellard/docker-credential-acr-env v0.0.0-20220119192733-fe33c00cee21
1010 github.com/google/go-containerregistry v0.8.1-0.20220110151055-a61fd0a8e2bb
1111)
@@ -58,7 +58,7 @@ require (
5858 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
5959 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
6060 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
61- golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
61+ golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
6262 google.golang.org/appengine v1.6.7 // indirect
6363 google.golang.org/protobuf v1.27.1 // indirect
6464 gotest.tools/v3 v3.1.0 // indirect
Original file line number Diff line number Diff line change @@ -16,10 +16,10 @@ package main
1616
1717import (
1818 "context"
19+ "io/ioutil"
1920 "os"
2021
2122 ecr "github.com/awslabs/amazon-ecr-credential-helper/ecr-login"
22- "github.com/awslabs/amazon-ecr-credential-helper/ecr-login/api"
2323 "github.com/chrismellard/docker-credential-acr-env/pkg/credhelper"
2424 "github.com/google/go-containerregistry/cmd/crane/cmd"
2525 "github.com/google/go-containerregistry/internal/signal"
@@ -31,7 +31,7 @@ import (
3131)
3232
3333var (
34- amazonKeychain authn.Keychain = authn .NewKeychainFromHelper (ecr.ECRHelper { ClientFactory : api. DefaultClientFactory {}} )
34+ amazonKeychain authn.Keychain = authn .NewKeychainFromHelper (ecr .NewECRHelper ( ecr . WithLogOutput ( ioutil . Discard )) )
3535 azureKeychain authn.Keychain = authn .NewKeychainFromHelper (credhelper .NewACRCredentialsHelper ())
3636)
3737
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ replace (
88)
99
1010require (
11- github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20211215200129-69c85dc22db6
11+ github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220216180153-3d7835abdf40
1212 github.com/chrismellard/docker-credential-acr-env v0.0.0-20220119192733-fe33c00cee21
1313 github.com/google/go-containerregistry v0.8.1-0.20220110151055-a61fd0a8e2bb
1414 github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20220128225446-c63684ed5f15
@@ -66,7 +66,7 @@ require (
6666 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
6767 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
6868 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
69- golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
69+ golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
7070 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
7171 golang.org/x/text v0.3.7 // indirect
7272 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
Original file line number Diff line number Diff line change @@ -16,9 +16,9 @@ package k8schain
1616
1717import (
1818 "context"
19+ "io/ioutil"
1920
2021 ecr "github.com/awslabs/amazon-ecr-credential-helper/ecr-login"
21- "github.com/awslabs/amazon-ecr-credential-helper/ecr-login/api"
2222 "github.com/chrismellard/docker-credential-acr-env/pkg/credhelper"
2323 "github.com/google/go-containerregistry/pkg/authn"
2424 kauth "github.com/google/go-containerregistry/pkg/authn/kubernetes"
@@ -29,7 +29,7 @@ import (
2929)
3030
3131var (
32- amazonKeychain authn.Keychain = authn .NewKeychainFromHelper (ecr.ECRHelper { ClientFactory : api. DefaultClientFactory {}} )
32+ amazonKeychain authn.Keychain = authn .NewKeychainFromHelper (ecr .NewECRHelper ( ecr . WithLogOutput ( ioutil . Discard )) )
3333 azureKeychain authn.Keychain = authn .NewKeychainFromHelper (credhelper .NewACRCredentialsHelper ())
3434)
3535
You can’t perform that action at this time.
0 commit comments