mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-09 21:17:09 +08:00
vendor: buildkit, docker/docker and docker/cli v27.0.1
diffs: - https://github.com/docker/cli/compare/v26.1.4..v27.0.1 - https://github.com/docker/docker/compare/v26.1.4..v27.0.1 - https://github.com/moby/buildkit/compare/v0.14.1...aaaf86e5470bffbb395f5c15ad4a1c152642ea30 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
10
vendor/github.com/moby/buildkit/client/solve.go
generated
vendored
10
vendor/github.com/moby/buildkit/client/solve.go
generated
vendored
@ -5,6 +5,7 @@ import (
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"maps"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@ -219,13 +220,8 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
|
||||
})
|
||||
}
|
||||
|
||||
frontendAttrs := map[string]string{}
|
||||
for k, v := range opt.FrontendAttrs {
|
||||
frontendAttrs[k] = v
|
||||
}
|
||||
for k, v := range cacheOpt.frontendAttrs {
|
||||
frontendAttrs[k] = v
|
||||
}
|
||||
frontendAttrs := maps.Clone(opt.FrontendAttrs)
|
||||
maps.Copy(frontendAttrs, cacheOpt.frontendAttrs)
|
||||
|
||||
solveCtx, cancelSolve := context.WithCancelCause(ctx)
|
||||
var res *SolveResponse
|
||||
|
Reference in New Issue
Block a user