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

Merge pull request #1479 from jedevc/fixup-git-err-check-order

Browse Source 
build: check error from toSolveOpt before adding FrontendAttrs
This commit is contained in:
CrazyMax 2022-12-16 16:28:17 +01:00 committed by GitHub
commit c93c02df85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/build.go
View File

@ -861,12 +861,12 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
so, release, err := toSolveOpt(ctx, node, multiDriver, opt, np.bopts, configDir, w, func(name string) (io.WriteCloser, func(), error) { so, release, err := toSolveOpt(ctx, node, multiDriver, opt, np.bopts, configDir, w, func(name string) (io.WriteCloser, func(), error) {
return docker.LoadImage(ctx, name, w) return docker.LoadImage(ctx, name, w)
}) })
for k, v := range gitattrs {
so.FrontendAttrs[k] = v
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
for k, v := range gitattrs {
so.FrontendAttrs[k] = v
}
defers = append(defers, release) defers = append(defers, release)
m[k][i].so = so m[k][i].so = so
} }