vendor: update buildkit to v0.7.0

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2020-04-09 22:34:51 -07:00
parent ed6be92de4
commit 7c627da986
4 changed files with 10 additions and 12 deletions

View File

@@ -435,13 +435,13 @@ func parseCacheOptions(opt SolveOpt) (*cacheOptions, error) {
continue
}
for _, m := range idx.Manifests {
if m.Annotations[ocispec.AnnotationRefName] == "latest" {
if (m.Annotations[ocispec.AnnotationRefName] == "latest" && attrs["tag"] == "") || (attrs["tag"] != "" && m.Annotations[ocispec.AnnotationRefName] == attrs["tag"]) {
attrs["digest"] = string(m.Digest)
break
}
}
if attrs["digest"] == "" {
return nil, errors.New("local cache importer requires either explicit digest or \"latest\" tag on index.json")
return nil, errors.New("local cache importer requires either explicit digest, \"latest\" tag or custom tag on index.json")
}
}
contentStores["local:"+csDir] = cs

4
vendor/modules.txt vendored
View File

@@ -58,7 +58,7 @@ github.com/containerd/continuity/syscallx
github.com/containerd/continuity/sysx
# github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew
# github.com/docker/cli v1.14.0-0 => github.com/docker/cli v0.0.0-20200303162255-7d407207c304
# github.com/docker/cli v0.0.0-20200227165822-2298e6a3fe24
github.com/docker/cli/cli
github.com/docker/cli/cli-plugins/manager
github.com/docker/cli/cli-plugins/plugin
@@ -225,7 +225,7 @@ github.com/matttproud/golang_protobuf_extensions/pbutil
github.com/miekg/pkcs11
# github.com/mitchellh/mapstructure v1.1.2
github.com/mitchellh/mapstructure
# github.com/moby/buildkit v0.6.2-0.20200303093749-09900f32dcaa
# github.com/moby/buildkit v0.7.0
github.com/moby/buildkit/api/services/control
github.com/moby/buildkit/api/types
github.com/moby/buildkit/client