dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-08 08:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: fileop description could be set from vertex name

Browse Source 
Signed-off-by: Morlay <morlay.null@gmail.com>
This commit is contained in:
Morlay
2022-06-25 16:14:28 +08:00
parent 536c3fedca
commit 7e00fe7d9c
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
solver/llbsolver/file/refmanager.go
View File

@@ -11,12 +11,13 @@ import (
"github.com/pkg/errors"
)
func NewRefManager(cm cache.Manager) *RefManager {
return &RefManager{cm: cm}
func NewRefManager(cm cache.Manager, name string) *RefManager {
return &RefManager{cm: cm, desc: name}
}
type RefManager struct {
cm cache.Manager
cm cache.Manager
desc string
}
func (rm *RefManager) Prepare(ctx context.Context, ref fileoptypes.Ref, readonly bool, g session.Group) (_ fileoptypes.Mount, rerr error) {
@@ -33,7 +34,13 @@ func (rm *RefManager) Prepare(ctx context.Context, ref fileoptypes.Ref, readonly
return &Mount{m: m, readonly: readonly}, nil
}
mr, err := rm.cm.New(ctx, ir, g, cache.WithDescription("fileop target"), cache.CachePolicyRetain)
desc := "fileop target"
if d := rm.desc; d != "" {
desc = d
}
mr, err := rm.cm.New(ctx, ir, g, cache.WithDescription(desc), cache.CachePolicyRetain)
if err != nil {
return nil, err
}

2
solver/llbsolver/ops/file.go
View File

@@ -46,7 +46,7 @@ func NewFileOp(v solver.Vertex, op *pb.Op_File, cm cache.Manager, parallelism *s
md: cm,
numInputs: len(v.Inputs()),
w: w,
solver: NewFileOpSolver(w, &file.Backend{}, file.NewRefManager(cm)),
solver: NewFileOpSolver(w, &file.Backend{}, file.NewRefManager(cm, v.Name())),
parallelism: parallelism,
}, nil
}