docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-19 01:47:43 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

build: use gateway's solve context to allow cancelling getResultAt

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell 2023-04-21 10:52:03 +01:00
parent 3d49bbd23a
commit 2402607846
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build.go
View File

@ -920,7 +920,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
} }
results.Set(resultKey(dp.driverIndex, k), res) results.Set(resultKey(dp.driverIndex, k), res)
if resultHandleFunc != nil { if resultHandleFunc != nil {
resultCtx, err := NewResultContext(cc, so, res) resultCtx, err := NewResultContext(ctx, cc, so, res)
if err == nil { if err == nil {
resultHandleFunc(dp.driverIndex, resultCtx) resultHandleFunc(dp.driverIndex, resultCtx)
} else { } else {

3
build/result.go
View File

@ -19,8 +19,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
func NewResultContext(c *client.Client, solveOpt client.SolveOpt, res *gateway.Result) (*ResultContext, error) { func NewResultContext(ctx context.Context, c *client.Client, solveOpt client.SolveOpt, res *gateway.Result) (*ResultContext, error) {
ctx := context.Background()
def, err := getDefinition(ctx, res) def, err := getDefinition(ctx, res)
if err != nil { if err != nil {
return nil, err return nil, err