Fix image pull auth for non-Docker Hub registries#458
Merged
jchangx merged 3 commits intodocker:mainfrom Mar 30, 2026
Merged
Conversation
Docker Desktop mirrors Hub credentials to dhi.io on login (pinata b497446ff36), but the gateway only passed registry auth for docker.io images. This caused 401 errors when pulling dhi.io images even though valid credentials existed in the credential store. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The gateway only passed registry auth for docker.io images, causing 401 errors when pulling from other registries (e.g. dhi.io) even when valid credentials existed in the Docker credential store. For non-docker.io registries, resolve credentials from the standard Docker CLI credential store (ConfigFile().GetAuthConfig), which works with any credential helper (osxkeychain, secretservice, etc.) and does not require Docker Desktop. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
jchangx
force-pushed
the
fix/dhi-registry-auth
branch
from
ab9e1d5 to
47b54b9
Compare
jchangx
changed the title
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 47b54b9f81
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Replace hand-rolled credential encoding with command.RetrieveAuthTokenFromImage which correctly handles IdentityToken auth, base64url encoding, and hostname normalization — the same auth path docker pull uses natively. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
jchangx
force-pushed
the
fix/dhi-registry-auth
branch
from
51048ed to
2fddfaf
Compare
Contributor
|
question: I get an error in docker desktop when trying to go into a dhi server. I guess that has more to do with the way the catalog is built/docker desktop expects and less to do with authentication? 
|
Contributor
|
question: this experience have something to do with these changes? Seems odd because it appear to work fine for dhi, but I get some kind of auth related issue for the docker mcp catalog? |
Contributor
|
question: again I may just be having environment issues. Been a while since I've run the regular DD gateway, but I can't seem to get cursor to load with a profile that has DHI images in it. 
|
bobbyhouse
approved these changes
Mar 26, 2026
Contributor
Author
Hmm, this change shouldn't impact the existing docker.io path at all since we just branch off. Given that pulling |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
RegistryAuthfordocker.io/prefixed images, causing401 Unauthorizederrors when pulling from other registries (e.g.dhi.iofor Docker Hardened Images of MCP servers) even when valid credentials existed in the Docker credential storecommand.RetrieveAuthTokenFromImageto resolve credentials from the credential store — the same auth path thatdocker pulluses natively/registry/tokenpathosxkeychain,secretservice, etc.)Test plan
docker mcp catalog pull docker/mcp-catalog-dhithendocker mcp gateway run— dhi.io images should pull without 401 errors🤖 Generated with Claude Code