From 7439bc7ba6bbfb3fb87622746c7ddb904806f12e Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Wed, 25 Jan 2023 19:29:10 -0800 Subject: [PATCH] cmd/sync-containers: add github.Keychain Running sync-containers in a GitHub workflow will be simpler if we check github.Keychain, which uses the GITHUB_TOKEN if present. Updates https://github.com/tailscale/corp/issues/8461 Signed-off-by: Denton Gentry --- cmd/sync-containers/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/sync-containers/main.go b/cmd/sync-containers/main.go index 8235e2040..c038e5754 100644 --- a/cmd/sync-containers/main.go +++ b/cmd/sync-containers/main.go @@ -24,6 +24,7 @@ import ( "strings" "github.com/google/go-containerregistry/pkg/authn" + "github.com/google/go-containerregistry/pkg/authn/github" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" @@ -47,8 +48,9 @@ func main() { log.Fatalf("--dst is required") } + keychain := authn.NewMultiKeychain(authn.DefaultKeychain, github.Keychain) opts := []remote.Option{ - remote.WithAuthFromKeychain(authn.DefaultKeychain), + remote.WithAuthFromKeychain(keychain), remote.WithContext(context.Background()), }