diff --git a/vendor.conf b/vendor.conf index 309b406f26f3e..588ba2f600dc2 100644 --- a/vendor.conf +++ b/vendor.conf @@ -26,7 +26,7 @@ github.com/imdario/mergo v0.3.6 golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca # buildkit -github.com/moby/buildkit a9fe50acf16dd05d1f9877b27068884543ad7a1f +github.com/moby/buildkit d88354f7856a1fafef6f23bc9c5a538c246f4023 github.com/tonistiigi/fsutil b19464cd1b6a00773b4f2eb7acf9c30426f9df42 github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746 github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7 diff --git a/vendor/github.com/moby/buildkit/cache/remotecache/registry/registry.go b/vendor/github.com/moby/buildkit/cache/remotecache/registry/registry.go index fa9dc1a7f2cb0..fa23aa5522038 100644 --- a/vendor/github.com/moby/buildkit/cache/remotecache/registry/registry.go +++ b/vendor/github.com/moby/buildkit/cache/remotecache/registry/registry.go @@ -10,17 +10,17 @@ import ( "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/auth" "github.com/moby/buildkit/util/contentutil" - "github.com/moby/buildkit/util/tracing" + "github.com/moby/buildkit/util/resolver" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) -func ResolveCacheExporterFunc(sm *session.Manager) remotecache.ResolveCacheExporterFunc { +func ResolveCacheExporterFunc(sm *session.Manager, resolverOpt resolver.ResolveOptionsFunc) remotecache.ResolveCacheExporterFunc { return func(ctx context.Context, typ, ref string) (remotecache.Exporter, error) { if typ != "" { return nil, errors.Errorf("unsupported cache exporter type: %s", typ) } - remote := newRemoteResolver(ctx, sm) + remote := newRemoteResolver(ctx, resolverOpt, sm, ref) pusher, err := remote.Pusher(ctx, ref) if err != nil { return nil, err @@ -29,12 +29,12 @@ func ResolveCacheExporterFunc(sm *session.Manager) remotecache.ResolveCacheExpor } } -func ResolveCacheImporterFunc(sm *session.Manager) remotecache.ResolveCacheImporterFunc { +func ResolveCacheImporterFunc(sm *session.Manager, resolverOpt resolver.ResolveOptionsFunc) remotecache.ResolveCacheImporterFunc { return func(ctx context.Context, typ, ref string) (remotecache.Importer, specs.Descriptor, error) { if typ != "" { return nil, specs.Descriptor{}, errors.Errorf("unsupported cache importer type: %s", typ) } - remote := newRemoteResolver(ctx, sm) + remote := newRemoteResolver(ctx, resolverOpt, sm, ref) xref, desc, err := remote.Resolve(ctx, ref) if err != nil { return nil, specs.Descriptor{}, err @@ -47,11 +47,10 @@ func ResolveCacheImporterFunc(sm *session.Manager) remotecache.ResolveCacheImpor } } -func newRemoteResolver(ctx context.Context, sm *session.Manager) remotes.Resolver { - return docker.NewResolver(docker.ResolverOptions{ - Client: tracing.DefaultClient, - Credentials: getCredentialsFunc(ctx, sm), - }) +func newRemoteResolver(ctx context.Context, resolverOpt resolver.ResolveOptionsFunc, sm *session.Manager, ref string) remotes.Resolver { + opt := resolverOpt(ref) + opt.Credentials = getCredentialsFunc(ctx, sm) + return docker.NewResolver(opt) } func getCredentialsFunc(ctx context.Context, sm *session.Manager) func(string) (string, string, error) { diff --git a/vendor/github.com/moby/buildkit/solver/jobs.go b/vendor/github.com/moby/buildkit/solver/jobs.go index 15dcde8847f43..5a996ee806f3d 100644 --- a/vendor/github.com/moby/buildkit/solver/jobs.go +++ b/vendor/github.com/moby/buildkit/solver/jobs.go @@ -444,6 +444,7 @@ func (j *Job) Discard() error { j.pw.Close() for k, st := range j.list.actives { + st.mu.Lock() if _, ok := st.jobs[j]; ok { delete(st.jobs, j) j.list.deleteIfUnreferenced(k, st) @@ -451,6 +452,7 @@ func (j *Job) Discard() error { if _, ok := st.allPw[j.pw]; ok { delete(st.allPw, j.pw) } + st.mu.Unlock() } return nil } diff --git a/vendor/github.com/moby/buildkit/util/resolver/resolver.go b/vendor/github.com/moby/buildkit/util/resolver/resolver.go new file mode 100644 index 0000000000000..da28923564cd3 --- /dev/null +++ b/vendor/github.com/moby/buildkit/util/resolver/resolver.go @@ -0,0 +1,45 @@ +package resolver + +import ( + "math/rand" + + "github.com/containerd/containerd/remotes/docker" + "github.com/docker/distribution/reference" + "github.com/moby/buildkit/util/tracing" +) + +type RegistryConf struct { + Mirrors []string + PlainHTTP bool +} + +type ResolveOptionsFunc func(string) docker.ResolverOptions + +func NewResolveOptionsFunc(m map[string]RegistryConf) ResolveOptionsFunc { + return func(ref string) docker.ResolverOptions { + def := docker.ResolverOptions{ + Client: tracing.DefaultClient, + } + + parsed, err := reference.ParseNormalizedNamed(ref) + if err != nil { + return def + } + host := reference.Domain(parsed) + + c, ok := m[host] + if !ok { + return def + } + + if len(c.Mirrors) > 0 { + def.Host = func(string) (string, error) { + return c.Mirrors[rand.Intn(len(c.Mirrors))], nil + } + } + + def.PlainHTTP = c.PlainHTTP + + return def + } +} diff --git a/vendor/github.com/moby/buildkit/vendor.conf b/vendor/github.com/moby/buildkit/vendor.conf index ad490d2a9a611..c4c0b0a2b8643 100644 --- a/vendor/github.com/moby/buildkit/vendor.conf +++ b/vendor/github.com/moby/buildkit/vendor.conf @@ -39,7 +39,7 @@ golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/docker/docker 71cd53e4a197b303c6ba086bd584ffd67a884281 github.com/pkg/profile 5b67d428864e92711fcbd2f8629456121a56d91f -github.com/tonistiigi/fsutil b19464cd1b6a00773b4f2eb7acf9c30426f9df42 +github.com/tonistiigi/fsutil 7e391b0e788f9b925f22bd3cf88e0210d1643673 github.com/hashicorp/go-immutable-radix 826af9ccf0feeee615d546d69b11f8e98da8c8f1 git://github.com/tonistiigi/go-immutable-radix.git github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4 github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b