add support for "registry-mirrors" and "insecure-registries" to buildkit #37852

AntaresS · 2018-09-14T23:11:32Z

- What I did

update vendor with the recent patch from buildkit resolver: add config support for mirrors/plainhttp buildkit#612
integrated with moby side where buildkit is being invoked.
- pass registry-mirror and insecure-registries fields from daemon.json to buildkit in order to make use.
- supports live reloading when daemon.json file changes.

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

AntaresS · 2018-09-14T23:27:46Z

@tonistiigi ptal when you have a chance

codecov · 2018-09-16T19:29:31Z

Codecov Report

Merging #37852 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master   #37852      +/-   ##
==========================================
- Coverage   36.12%   36.12%   -0.01%     
==========================================
  Files         610      610              
  Lines       45083    45114      +31     
==========================================
+ Hits        16288    16296       +8     
- Misses      26555    26580      +25     
+ Partials     2240     2238       -2

Signed-off-by: Anda Xu <anda.xu@docker.com>

AntaresS · 2018-09-18T18:49:04Z

ping @tiborvass @tonistiigi

tiborvass · 2018-09-19T20:12:16Z

builder/builder-next/builder.go

@@ -8,6 +8,8 @@ import (
 	"sync"
 	"time"

+	"github.com/moby/buildkit/util/resolver"
+


nit: unneeded whitespace

tiborvass · 2018-09-19T20:20:00Z

daemon/daemon.go

+		)
+		// must trim "https://" prefix
+		for i, v := range daemon.configStore.Mirrors {
+			mirrors[i] = strings.Split(v, "//")[1]


this is going to panic if there is no //, which according to https://github.com/moby/moby/blob/master/registry/service_v2.go#L15 could happen.

Cleaner to use strings.Index, maybe like

if idx := strings.Index(v, "://"); idx > 0 { v = v[idx+3:] }

dmcgowan · 2018-09-19T23:48:16Z

daemon/daemon.go

+		// set "insecure-registries"
+		for _, v := range daemon.configStore.InsecureRegistries {
+			m[v] = resolver.RegistryConf{
+				PlainHTTP: true,


Does this need to get set if the mirror prefix is "http://"?

@dmcgowan Ah I think I the "http://" prefix must be trimmed here as well. Otherwise, buildkit will add an extra prefix.

dmcgowan · 2018-09-20T18:15:41Z

daemon/daemon.go

+			mirrors     = make([]string, len(daemon.configStore.Mirrors))
+			m           = map[string]resolver.RegistryConf{}
+		)
+		// must trim "https://" prefix


Is http:// not valid in configuration?

OK. Actually I just learned it is also valid 😅

Added a trimming for that as well

Signed-off-by: Anda Xu <anda.xu@docker.com>

dmcgowan · 2018-09-20T20:32:22Z

LGTM

AntaresS · 2018-09-20T20:32:55Z

@tiborvass @dmcgowan updated the PR based on the comments. Ptal when you have time.

tiborvass

LGTM

AntaresS requested a review from tonistiigi as a code owner September 14, 2018 23:11

GordonTheTurtle added the status/0-triage label Sep 14, 2018

AntaresS force-pushed the patch-buildkit branch from e6b79b6 to 9eb0664 Compare September 14, 2018 23:26

AntaresS force-pushed the patch-buildkit branch 5 times, most recently from c16325e to 9047d3b Compare September 16, 2018 19:29

update vendor

308701f

Signed-off-by: Anda Xu <anda.xu@docker.com>

AntaresS force-pushed the patch-buildkit branch from 9047d3b to 3c14b8b Compare September 16, 2018 19:57

yongtang added status/2-code-review rebuild/janky and removed status/0-triage labels Sep 17, 2018

GordonTheTurtle removed rebuild/janky labels Sep 17, 2018

yongtang requested a review from tiborvass September 17, 2018 16:41

AntaresS force-pushed the patch-buildkit branch 6 times, most recently from ac4e143 to 59482e0 Compare September 17, 2018 23:27

tiborvass reviewed Sep 19, 2018

View reviewed changes

dmcgowan reviewed Sep 19, 2018

View reviewed changes

AntaresS force-pushed the patch-buildkit branch from 59482e0 to 0695415 Compare September 20, 2018 07:03

AntaresS force-pushed the patch-buildkit branch from 0695415 to 0f24381 Compare September 20, 2018 07:11

thaJeztah added the area/builder label Sep 20, 2018

dmcgowan reviewed Sep 20, 2018

View reviewed changes

add support of registry-mirrors and insecure-registries to buildkit

171d51c

Signed-off-by: Anda Xu <anda.xu@docker.com>

AntaresS force-pushed the patch-buildkit branch from 0f24381 to 171d51c Compare September 20, 2018 18:53

tiborvass approved these changes Sep 20, 2018

View reviewed changes

tiborvass added status/4-merge and removed status/2-code-review labels Sep 20, 2018

vdemeester added rebuild/experimental labels Sep 21, 2018

GordonTheTurtle removed rebuild/experimental labels Sep 21, 2018

tonistiigi merged commit b111647 into moby:master Sep 21, 2018

AntaresS mentioned this pull request Sep 21, 2018

[18.09] backport adding support for "registry-mirrors" and "insecure-registries" to buildkit docker-archive/engine#58

Closed

tonistiigi mentioned this pull request Sep 22, 2018

[18.09] Backport Buildkit fixes for 18.09 docker-archive/engine#59

Merged

tonistiigi mentioned this pull request Oct 18, 2018

builder: fix private pulls on buildkit #38057

Merged

thaJeztah mentioned this pull request Oct 18, 2018

[18.09 backport] builder: fix private pulls on buildkit docker-archive/engine#91

Closed

tonistiigi mentioned this pull request Oct 18, 2018

[18.09 backport] builder: fix private pulls on buildkit docker-archive/engine#88

Merged

thaJeztah added the impact/changelog label Oct 26, 2018

lbndev mentioned this pull request Nov 30, 2018

Buildkit in docker 18.09 won't allow insecure registry with self-signed TLS #38303

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add support for "registry-mirrors" and "insecure-registries" to buildkit #37852

add support for "registry-mirrors" and "insecure-registries" to buildkit #37852

AntaresS commented Sep 14, 2018 •

edited

Loading

AntaresS commented Sep 14, 2018

codecov bot commented Sep 16, 2018 •

edited

Loading

AntaresS commented Sep 18, 2018

tiborvass Sep 19, 2018

AntaresS Sep 20, 2018

tiborvass Sep 19, 2018

dmcgowan Sep 19, 2018

dmcgowan Sep 19, 2018

AntaresS Sep 20, 2018

dmcgowan Sep 20, 2018

AntaresS Sep 20, 2018

AntaresS Sep 20, 2018

dmcgowan commented Sep 20, 2018

AntaresS commented Sep 20, 2018

tiborvass left a comment

add support for "registry-mirrors" and "insecure-registries" to buildkit #37852

add support for "registry-mirrors" and "insecure-registries" to buildkit #37852

Conversation

AntaresS commented Sep 14, 2018 • edited Loading

AntaresS commented Sep 14, 2018

codecov bot commented Sep 16, 2018 • edited Loading

Codecov Report

AntaresS commented Sep 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dmcgowan commented Sep 20, 2018

AntaresS commented Sep 20, 2018

tiborvass left a comment

Choose a reason for hiding this comment

AntaresS commented Sep 14, 2018 •

edited

Loading

codecov bot commented Sep 16, 2018 •

edited

Loading