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.

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

resolver: update to new registryhosts based config #1397

Merged
merged 1 commit into from
Mar 11, 2020

Conversation

tonistiigi
Copy link
Member

@tonistiigi tonistiigi commented Mar 5, 2020

fixes #1394
fixes #1271

@dmcgowan

Signed-off-by: Tonis Tiigi [email protected]

Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

LGTM. We should also support specifying CA and client certs, but can be a follow-up PR.

@tonistiigi tonistiigi force-pushed the registryhosts branch 2 times, most recently from 16151a0 to 5697fa8 Compare March 6, 2020 03:03
@tonistiigi
Copy link
Member Author

@AkihiroSuda Some updates were needed for CI to pass. PTAL again

@AkihiroSuda AkihiroSuda merged commit 0a08ab2 into moby:master Mar 11, 2020
h.Scheme = "http"
} else if c.Insecure != nil && *c.Insecure {
h.Client = &http.Client{
Transport: tracing.NewTransport(&http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}),
Copy link
Contributor

Choose a reason for hiding this comment

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

thanks god we have this patch. we are using version 0.6.2 and use http2 to push/pull image if there is no TLSClientConfig. The http2 flow control is killing me which makes the push very slow.

anyway, nice to have this patch!

Copy link
Member Author

Choose a reason for hiding this comment

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

@fuweid I think this requires more optimization actually. Afaics the issue with the array model is that it doesn't lock to the specific config when other fail. So it keeps retrying the ones that will fail for every request making things like mirrors inefficient.

@akavel
Copy link

akavel commented Nov 30, 2020

The commit claiming to fix this issue seems to be included in buildkit 0.7.0+. Can someone help me understand how can I find out which version of docker includes buildkit 0.7.0? I don't seem to see go.mod files in the docker or dockerd repo roots, so I don't really know where to search for that 😞 I also tried docker version and docker info (including with DOCKER_BUILDKIT=1), but don't seem to be able to find out "buildkit" mention in their outputs 😞

@thaJeztah
Copy link
Member

@akavel docker uses vndr (https://github.com/LK4D4/vndr) to manage dependencies; you can find the commit that's used in docker builds by looking at the vendor.conf file; the commit for docker 19.03.13 can be found here; https://github.com/moby/moby/blob/v19.03.13/vendor.conf#L29

Docker 19.03 uses BuildKit v0.6.x, but the v20.10.0 release candidates are upgraded to v0.8.x

@akavel
Copy link

akavel commented Nov 30, 2020

@thaJeztah thanks!!!! ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

move to registryhosts in containerd resolvers Build fails when FROM image isn't cached
5 participants