fix: Support global credsStore in docker config #602
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thesayyn
approved these changes
Jun 6, 2024
It is perfectly normal to have config.json with just the global config
store:
{ "credsStore": "osxkeychain" }
See https://github.com/docker/docker-credential-helpers?tab=readme-ov-file#usage
and https://github.com/google/go-containerregistry/tree/main/pkg/authn#helpers
for examples.
Previously, the authn-code would only look at the `credsStore` if there
was a specific host maching in `auths`, but lacking other authn-fields.
Now it also looks at the global `credsStore` as a fallback.
Fixes bazel-contrib#388.
|
Ugh. Copy/pasted an unassigned-variable in. Fixed, so the helper should now (properly) ask the credential-helper for credentials to the right registry. Diff from previous version: diff --git oci/private/authn.bzl oci/private/authn.bzl
index 902fdf6..8a2f531 100644
--- oci/private/authn.bzl
+++ oci/private/authn.bzl
@@ -183,7 +183,7 @@ def _get_auth(rctx, state, registry):
# look for generic credentials-store all lookups for host-specific auth fails
if "credsStore" in config and len(pattern.keys()) == 0:
- pattern = _fetch_auth_via_creds_helper(rctx, host_raw, config["credsStore"])
+ pattern = _fetch_auth_via_creds_helper(rctx, registry, config["credsStore"])
# cache the result so that we don't do this again unnecessarily.
state["auth"][registry] = pattern |
alexeagle
pushed a commit
that referenced
this pull request
Jun 7, 2024
This was referenced Jul 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It is perfectly normal to have config.json with just the global config store:
See https://github.com/docker/docker-credential-helpers?tab=readme-ov-file#usage and https://github.com/google/go-containerregistry/tree/main/pkg/authn#helpers for examples.
Previously, the authn-code would only look at the
credsStoreif there was a specific host maching inauths, but lacking other authn-fields.Now it also looks at the global
credsStoreas a fallback.Fixes #388.