docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-10 13:37:08 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

vendor: update buildkit to v0.20.0-rc1

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2025-02-11 12:43:07 -08:00
parent 350d3f0f4b
commit 03569c2188
22 changed files with 1733 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/github.com/moby/buildkit/util/testutil/workers/oci.go generated vendored
View File

@ -47,7 +47,12 @@ func (s *OCI) New(ctx context.Context, cfg *integration.BackendConfig) (integrat
return nil, nil, err
}
// Include use of --oci-worker-labels to trigger https://github.com/moby/buildkit/pull/603
buildkitdArgs := []string{"buildkitd", "--oci-worker=true", "--containerd-worker=false", "--oci-worker-gc=false", "--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true"}
buildkitdArgs := []string{"buildkitd",
"--oci-worker=true",
"--containerd-worker=false",
"--oci-worker-gc=false",
"--oci-worker-labels=org.mobyproject.buildkit.worker.sandbox=true",
}
if s.Snapshotter != "" {
buildkitdArgs = append(buildkitdArgs,

20
vendor/github.com/moby/buildkit/util/testutil/workers/util.go generated vendored
View File

@ -25,6 +25,20 @@ func (osp otelSocketPath) UpdateConfigFile(in string) string {
`, in, osp)
}
func withCDISpecDir(specDir string) integration.ConfigUpdater {
return cdiSpecDir(specDir)
}
type cdiSpecDir string
func (csd cdiSpecDir) UpdateConfigFile(in string) string {
return fmt.Sprintf(`%s
[cdi]
specDirs = [%q]
`, in, csd)
}
func runBuildkitd(
conf *integration.BackendConfig,
args []string,
@ -61,7 +75,11 @@ func runBuildkitd(
deferF.Append(func() error { return os.RemoveAll(tmpdir) })
cfgfile, err := integration.WriteConfig(
append(conf.DaemonConfig, withOTELSocketPath(getTraceSocketPath(tmpdir))))
append(conf.DaemonConfig,
withOTELSocketPath(getTraceSocketPath(tmpdir)),
withCDISpecDir(conf.CDISpecDir),
),
)
if err != nil {
return "", "", nil, err
}