Use default keychain to resolve OCI credentials #8273
Closed
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
|
I think it's actually feasible to test this, will close and re-open once that's added |
dan-stowell
reviewed
Jan 31, 2025
| @@ -92,11 +93,7 @@ func CredentialsFromProperties(props *platform.Properties) (Credentials, error) | |||
|
|
|||
| // If no credentials were provided, fallback to any specified by | |||
| // --executor.container_registries. | |||
| if len(*registries) == 0 { | |||
There was a problem hiding this comment.
Why do you not need to look at the registries anymore?
There was a problem hiding this comment.
We still look at the registries, this just removes the short-circuit if there are no registries configured, so that we can fall back to using the default keychain below.
|
Moved to #8274 (github won't let me reopen since I force-pushed) |
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.
Credential helpers stopped working for one of our users after they switched from podman to OCI. This PR enables the default keychain (behind a flag) so that credential helpers will work.
Future improvements:
~/.config/containers/auth.jsonfile to work. Without this patch, the~/.config/containers/auth.jsonpath will not work, but in the meantime,~/.docker/config.jsoncan be used instead, orREGISTRY_AUTH_FILE=/root/.config/containers/auth.jsoncan be set as an environment variable on the executor container.