Allow username/password in config file #2122
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
Signed-off-by: Jon Johnson <jonjohnson@google.com>
|
ping @tiborvass Came across this when I switched over to using docker/cli for config file parsing. Docker seems to ignore the username/password fields from a config file if they're set directly instead of the "auth" field. |
max-wittig
approved these changes
Oct 14, 2019
|
@silvin-lubecki @chris-crone @vdemeester Could you please take a look at this small fix. It would really help. Thanks! |
Signed-off-by: Jon Johnson <jonjohnson@google.com>
|
@jonjohnsonjr linter is complaining
|
Signed-off-by: Jon Johnson <jonjohnson@google.com>
thaJeztah
added
area/distribution
impact/changelog
process/cherry-picked
status/4-merge
and removed
process/cherry-pick
status/0-triage
labels
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.
- What I did
Only decode
authif it is present. Currently, this overwritesusernameandpasswordfields, even ifauthis empty.Fixes google/go-containerregistry#555
- How I did it
Guard
decodeAuthwith an empty string check.- How to verify it
Run the unit test :)
Alternatively, modify your config file to use username/password instead of auth and try it. I have a branch here which seems to work when I try it 👍
- Description for the changelog
Fix reading config files containing "username" and "password" auth.