vendor: update buildkit to v0.20.0-rc2

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2025-02-13 16:54:50 -08:00
parent 6a6fa4f422
commit 1784f84561
No known key found for this signature in database
GPG Key ID: AFA9DE5F8AB7AF39
8 changed files with 24 additions and 6 deletions

2
go.mod
View File

@ -29,7 +29,7 @@ require (
github.com/hashicorp/hcl/v2 v2.23.0 github.com/hashicorp/hcl/v2 v2.23.0
github.com/in-toto/in-toto-golang v0.5.0 github.com/in-toto/in-toto-golang v0.5.0
github.com/mitchellh/hashstructure/v2 v2.0.2 github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/moby/buildkit v0.20.0-rc1 github.com/moby/buildkit v0.20.0-rc2
github.com/moby/sys/mountinfo v0.7.2 github.com/moby/sys/mountinfo v0.7.2
github.com/moby/sys/signal v0.7.1 github.com/moby/sys/signal v0.7.1
github.com/morikuni/aec v1.0.0 github.com/morikuni/aec v1.0.0

4
go.sum
View File

@ -297,8 +297,8 @@ github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/z
github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/moby/buildkit v0.20.0-rc1 h1:aRO8ApLVz7EuzCVPUFmXiU5nwQkYDUPty9InUp0HJes= github.com/moby/buildkit v0.20.0-rc2 h1:QjACghvG0pSAp7dk9aQMYWioDEOljDWyyoUjyg35qfg=
github.com/moby/buildkit v0.20.0-rc1/go.mod h1:mtRqVBkksyvFm+ljU1u+cigDh36TdFvlEGfz/XbYTiI= github.com/moby/buildkit v0.20.0-rc2/go.mod h1:kMXf90l/f3zygRK8bYbyetfyzoJYntb6Bpi2VsLfXgQ=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=

View File

@ -463,7 +463,7 @@ func init() {
Caps.Init(apicaps.Cap{ Caps.Init(apicaps.Cap{
ID: CapRemoteCacheAzBlob, ID: CapRemoteCacheAzBlob,
Enabled: false, Enabled: true,
Status: apicaps.CapStatusExperimental, Status: apicaps.CapStatusExperimental,
}) })

View File

@ -110,6 +110,20 @@ func (r *Result[T]) EachRef(fn func(T) error) (err error) {
return err return err
} }
// IsEmpty returns true if this result does not refer to
// any references.
func (r *Result[T]) IsEmpty() bool {
r.mu.Lock()
defer r.mu.Unlock()
if len(r.Refs) > 0 {
return false
}
var zero T
return r.Ref == zero
}
// EachRef iterates over references in both a and b. // EachRef iterates over references in both a and b.
// a and b are assumed to be of the same size and map their references // a and b are assumed to be of the same size and map their references
// to the same set of keys // to the same set of keys

View File

@ -18,7 +18,7 @@ var (
var ( var (
UserCNIConfigPath = DefaultCNIConfigPath UserCNIConfigPath = DefaultCNIConfigPath
CDISpecDirs []string CDISpecDirs = []string{filepath.Join(os.Getenv("ProgramData"), "buildkitd", "cdi")}
) )
func UserAddress() string { func UserAddress() string {

View File

@ -41,6 +41,7 @@ func InitDockerdWorker() {
FeatureSBOM, FeatureSBOM,
FeatureSecurityMode, FeatureSecurityMode,
FeatureCNINetwork, FeatureCNINetwork,
FeatureCDI,
}, },
}) })
integration.Register(&Moby{ integration.Register(&Moby{
@ -51,6 +52,7 @@ func InitDockerdWorker() {
FeatureSecurityMode, FeatureSecurityMode,
FeatureCNINetwork, FeatureCNINetwork,
FeatureContentCheck, FeatureContentCheck,
FeatureCDI,
}, },
}) })
} }

View File

@ -31,6 +31,7 @@ const (
FeatureSourceDateEpoch = "source_date_epoch" FeatureSourceDateEpoch = "source_date_epoch"
FeatureCNINetwork = "cni_network" FeatureCNINetwork = "cni_network"
FeatureContentCheck = "content_check" FeatureContentCheck = "content_check"
FeatureCDI = "cdi"
) )
var features = map[string]struct{}{ var features = map[string]struct{}{
@ -58,6 +59,7 @@ var features = map[string]struct{}{
FeatureSourceDateEpoch: {}, FeatureSourceDateEpoch: {},
FeatureCNINetwork: {}, FeatureCNINetwork: {},
FeatureContentCheck: {}, FeatureContentCheck: {},
FeatureCDI: {},
} }
func CheckFeatureCompat(t *testing.T, sb integration.Sandbox, reason ...string) { func CheckFeatureCompat(t *testing.T, sb integration.Sandbox, reason ...string) {

2
vendor/modules.txt vendored
View File

@ -493,7 +493,7 @@ github.com/mitchellh/go-wordwrap
github.com/mitchellh/hashstructure/v2 github.com/mitchellh/hashstructure/v2
# github.com/mitchellh/mapstructure v1.5.0 # github.com/mitchellh/mapstructure v1.5.0
## explicit; go 1.14 ## explicit; go 1.14
# github.com/moby/buildkit v0.20.0-rc1 # github.com/moby/buildkit v0.20.0-rc2
## explicit; go 1.22.0 ## explicit; go 1.22.0
github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/services/control
github.com/moby/buildkit/api/types github.com/moby/buildkit/api/types