alextab93/buildx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3886 from tonistiigi/progress-panic-fix

Browse Source 
build: fix policy resolver cleanup on errors
This commit is contained in:
CrazyMax
2026-06-04 10:15:41 +02:00
committed by GitHub
parent e868b4d8f8 4dd20d3c03
commit 2769ed4e9e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/opt.go
+2 -2
View File
@@ -627,7 +627,7 @@ func proxyArgKeyExists(buildArgs map[string]string, key string) bool {
return false
}
func configureSourcePolicy(ctx context.Context, np *noderesolver.ResolvedNode, opt *Options, cfg *confutil.Config, bopts gateway.BuildOpts, so *client.SolveOpt, pw progress.Writer) (defers []func(error), err error) {
func configureSourcePolicy(ctx context.Context, np *noderesolver.ResolvedNode, opt *Options, cfg *confutil.Config, bopts gateway.BuildOpts, so *client.SolveOpt, pw progress.Writer) (_ []func(error), err error) {
if opt.Inputs.policy == nil {
if len(opt.Policy) > 0 {
return nil, errors.New("policy file specified but no policy FS in build context")
@@ -677,7 +677,7 @@ func configureSourcePolicy(ctx context.Context, np *noderesolver.ResolvedNode, o
return nil, err
}
sourceResolver := sourcemeta.NewResolver(c, sourcemeta.WithProgressWriter(pw), sourcemeta.WithSession(so.Session))
defers = []func(error){
defers := []func(error){
func(error) {
_ = sourceResolver.Close()
},