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

vendor: update buildkit to 71f99c52a669

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2024-04-17 08:21:11 -07:00
parent 1b16594f4a
commit 13653fb84d
18 changed files with 112 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@ disabled_plugins = ["cri"]
"nsenter", "-U", "--preserve-credentials", "-m", "-t", fmt.Sprintf("%d", pid)},
append(buildkitdArgs, "--containerd-worker-snapshotter=native")...)
}
buildkitdSock, stop, err := runBuildkitd(ctx, cfg, buildkitdArgs, cfg.Logs, c.UID, c.GID, c.ExtraEnv)
buildkitdSock, stop, err := runBuildkitd(cfg, buildkitdArgs, cfg.Logs, c.UID, c.GID, c.ExtraEnv)
if err != nil {
integration.PrintLogs(cfg.Logs, log.Println)
return nil, nil, err

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

@ -77,7 +77,7 @@ func (s *OCI) New(ctx context.Context, cfg *integration.BackendConfig) (integrat
if runtime.GOOS != "windows" && s.Snapshotter != "native" {
extraEnv = append(extraEnv, "BUILDKIT_DEBUG_FORCE_OVERLAY_DIFF=true")
}
buildkitdSock, stop, err := runBuildkitd(ctx, cfg, buildkitdArgs, cfg.Logs, s.UID, s.GID, extraEnv)
buildkitdSock, stop, err := runBuildkitd(cfg, buildkitdArgs, cfg.Logs, s.UID, s.GID, extraEnv)
if err != nil {
integration.PrintLogs(cfg.Logs, log.Println)
return nil, nil, err

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

@ -2,7 +2,6 @@ package workers
import (
"bytes"
"context"
"fmt"
"os"
"os/exec"
@ -27,7 +26,6 @@ func (osp otelSocketPath) UpdateConfigFile(in string) string {
}
func runBuildkitd(
ctx context.Context,
conf *integration.BackendConfig,
args []string,
logs map[string]*bytes.Buffer,

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

@ -35,11 +35,11 @@ func getContainerdDebugSock(tmpdir string) string {
}
// no-op for parity with unix
func mountInfo(tmpdir string) error {
func mountInfo(_ string) error {
return nil
}
func chown(name string, uid, gid int) error {
func chown(_ string, _, _ int) error {
// Chown not supported on Windows
return nil
}