Make the Nerdctl dockerresolver module happy. #2745
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
|
Note that this isn't top-priority because it only affects people who move from moby/docker to containerd |
|
Needed for Windows too - in progress |
ericpromislow
force-pushed
the
2689-fix-nerdctl
branch
from
4ef3977
to
4fba51a
Compare
mook-as
requested changes
Aug 16, 2022
There was a problem hiding this comment.
Code looks generally okay, but please add comments (for both places) to indicate why this is needed; otherwise it just looks like stale code. (I realize that git blame would say things, but we should still have some comment.)
To preempt the next review — the comment should actually explain the issue, and not just a URL. Having a link to details, of course, is appreciated.
A bug in the nerdctl client expects to see an `auths` entry for `https://index.docker.io/v1/` in `~/.docker/config.json` even when we're getting the credentials from the `credsStore` field. This is a workaround for upstream PR containerd/nerdctl#1315 Signed-off-by: Eric Promislow <epromislow@suse.com>
Signed-off-by: Eric Promislow <epromislow@suse.com>
ericpromislow
force-pushed
the
2689-fix-nerdctl
branch
from
4fba51a
to
5b436ee
Compare
mook-as
approved these changes
Aug 17, 2022
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.
Fixes #2689
If a user is logged in, but there's no auths["https://index.docker.io/v1/"]
entry in the root's
.docker/config.jsonfile, the docker-resolvercode will get confused.
So here's how to get into the state that this change fixes:
Without this change, you'll see an error along the lines of
With this change, nerdctl should proceed as usual.
Note that with no
authsfield in/root/.docker/config.json, runningdocker logindoesn't add it, but runningnerdctl logindoes.And if the user is logged out when the code is run,
nerdctl logoutchanges the field to
auths: {}, but the behavior is the same forlogged out users, whether auths is empty or has an entry for
index.docker.io.
The real error here is that when a
configsStorefield is given in.docker/config.json, theauthsfield should be ignored. Docker isignoring it, nerdctl isn't.
Upstream issue: github.com/containerd/nerdctl/pull/1315 with
PR 1315, but some integration tests are failing (looks like due to
flakes) and I don't see a straightforward way to provide unit tests.
Signed-off-by: Eric Promislow epromislow@suse.com