mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-10 13:37:08 +08:00
vendor: update buildkit to v0.20.0-rc1
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
7
vendor/github.com/moby/buildkit/util/testutil/workers/oci.go
generated
vendored
7
vendor/github.com/moby/buildkit/util/testutil/workers/oci.go
generated
vendored
@ -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
20
vendor/github.com/moby/buildkit/util/testutil/workers/util.go
generated
vendored
@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user