[24.0 backport] Fix setting ServerAddress property in NativeStore #4824
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.
This will return the ServerAddress property when using the NativeStore. This happens when you use docker credential helpers, not the credential store.
The reason this fix is needed is because it needs to be propagated properly down towards
moby/moby
project in the following logic:This logic resides in the following file :
daemon/containerd/resolver.go
.In the case when using the containerd storage feature when setting the
cfgHost
variable from theauthConfig.ServerAddress
it will always be empty. Since it will never be returned from the NativeStore currently. Therefore Docker Hub images will work fine, but anything else will fail since thecfgHost
will always be theregistry.DefaultRegistryHost
.(cherry picked from commit b24e7f8)
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)