Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

util/resolver: Fix insecure mirrors #4293

Merged
merged 1 commit into from
Sep 29, 2023
Merged

util/resolver: Fix insecure mirrors #4293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions util/resolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,10 @@ func NewRegistryConfig(m map[string]config.RegistryConfig) docker.RegistryHosts

var out []docker.RegistryHost

for _, mirror := range c.Mirrors {
h := newMirrorRegistryHost(mirror)
hosts, err := fillInsecureOpts(mirror, m[mirror], h)
for _, rawMirror := range c.Mirrors {
h := newMirrorRegistryHost(rawMirror)
mirrorHost := h.Host
hosts, err := fillInsecureOpts(mirrorHost, m[mirrorHost], h)
Comment on lines +133 to +136
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I think I understand this :)

This fix LGTM - since RegistryConfig always supported multiple URLs, this code was always wrong then? And just didn't ever appear, since we were never using it in this way from moby.

if err != nil {
return nil, err
}
Expand Down