JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return exec error for errors returned before executor 

Signed-off-by: Edgar Lee <edgarl@netflix.com>
v0.8
Edgar Lee 2020-11-04 16:51:53 -08:00
parent bbc3f6df4c
commit a459eb4927
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solver/llbsolver/ops/exec.go
View File

@ -214,7 +214,7 @@ func addDefaultEnvvar(env []string, k, v string) []string {
return append(env, k+"="+v)
}
func (e *execOp) Exec(ctx context.Context, g session.Group, inputs []solver.Result) ([]solver.Result, error) {
func (e *execOp) Exec(ctx context.Context, g session.Group, inputs []solver.Result) (refs []solver.Result, err error) {
var mounts []executor.Mount
var root cache.Mountable
var readonlyRootFS bool
@ -227,6 +227,9 @@ func (e *execOp) Exec(ctx context.Context, g session.Group, inputs []solver.Resu
go o.Release(context.TODO())
}
}
if err != nil {
err = errdefs.WithExecError(errors.Wrapf(err, "executor failed running %v", e.op.Meta.Args), inputs, refs)
}
}()
// loop over all mounts, fill in mounts, root and outputs
@ -405,7 +408,6 @@ func (e *execOp) Exec(ctx context.Context, g session.Group, inputs []solver.Resu
Stderr: stderr,
}, nil)
refs := []solver.Result{}
for i, out := range outputs {
if mutable, ok := out.(cache.MutableRef); ok {
ref, err := mutable.Commit(ctx)
@ -419,10 +421,7 @@ func (e *execOp) Exec(ctx context.Context, g session.Group, inputs []solver.Resu
outputs[i] = nil
}
if execErr != nil {
return nil, errdefs.WithExecError(errors.Wrapf(execErr, "executor failed running %v", meta.Args), inputs, refs)
}
return refs, nil
return refs, execErr
}
func proxyEnvList(p *pb.ProxyEnv) []string {