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

Reduce code duplication with a closure. 

Signed-off-by: Ian Campbell <ijc@docker.com>
docker-18.09
Ian Campbell 2018-04-03 11:13:15 +01:00
parent ddae5a6ea4
commit 2e6adc027d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solver/llbop/exec.go
View File

@ -84,11 +84,16 @@ func (e *execOp) Run(ctx context.Context, inputs []solver.Ref) ([]solver.Ref, er
} }
mountable = ref mountable = ref
} }
activate := func(cache.ImmutableRef) (cache.MutableRef, error) {
desc := fmt.Sprintf("mount %s from exec %s", m.Dest, strings.Join(e.op.Meta.Args, " "))
return e.cm.New(ctx, ref, cache.WithDescription(desc)) // TODO: should be method `immutableRef.New() mutableRef`
}
if m.Output != pb.SkipOutput { if m.Output != pb.SkipOutput {
if m.Readonly && ref != nil && m.Dest != pb.RootMount { // exclude read-only rootfs if m.Readonly && ref != nil && m.Dest != pb.RootMount { // exclude read-only rootfs
outputs = append(outputs, solver.NewSharedRef(ref).Clone()) outputs = append(outputs, solver.NewSharedRef(ref).Clone())
} else { } else {
active, err := e.cm.New(ctx, ref, cache.WithDescription(fmt.Sprintf("mount %s from exec %s", m.Dest, strings.Join(e.op.Meta.Args, " ")))) // TODO: should be method active, err := activate(ref)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -105,8 +110,7 @@ func (e *execOp) Run(ctx context.Context, inputs []solver.Ref) ([]solver.Ref, er
root = mountable root = mountable
readonlyRootFS = m.Readonly readonlyRootFS = m.Readonly
if m.Output == pb.SkipOutput && readonlyRootFS { if m.Output == pb.SkipOutput && readonlyRootFS {
// XXX this duplicates a case from above. active, err := activate(ref)
active, err := e.cm.New(ctx, ref, cache.WithDescription(fmt.Sprintf("mount %s from exec %s", m.Dest, strings.Join(e.op.Meta.Args, " ")))) // TODO: should be method
if err != nil { if err != nil {
return nil, err return nil, err
} }