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

solver, worker: minor cleanup 

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
docker-18.09
Akihiro Suda 2017-12-15 19:51:06 +09:00
parent efde4f2340
commit 21bebaea80
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solver/llbsolver.go
View File

@ -29,7 +29,7 @@ func NewLLBOpSolver(opt LLBOpt) *Solver {
if err != nil {
return nil, err
}
return w.Resolve(v, s)
return w.ResolveVertex(v, s)
}, opt.WorkerController, determineVertexWorker, opt.Frontends, opt.CacheExporter, opt.CacheImporter)
return s
}

2
worker/base/worker.go
View File

@ -204,7 +204,7 @@ func NewWorker(opt WorkerOpt) (*Worker, error) {
}, nil
}
func (w *Worker) Resolve(v solver.Vertex, s worker.SubBuilder) (solver.Op, error) {
func (w *Worker) ResolveVertex(v solver.Vertex, s worker.SubBuilder) (solver.Op, error) {
switch op := v.Sys().(type) {
case *pb.Op_Source:
return llbop.NewSourceOp(v, op, w.SourceManager)

20
worker/worker.go
View File

@ -13,30 +13,16 @@ import (
"golang.org/x/net/context"
)
// Worker is a local worker instance with dedicated snapshotter, cache, and so on.
// TODO: s/Worker/OpWorker/g ?
// FIXME: Worker should be rather an interface
// type Worker struct {
// WorkerOpt
// Snapshotter ctdsnapshot.Snapshotter // blobmapping snapshotter
// CacheManager cache.Manager
// SourceManager *source.Manager
// InstructionCache instructioncache.InstructionCache
// Exporters map[string]exporter.Exporter
// ImageSource source.Source
// CacheExporter *cacheimport.CacheExporter
// CacheImporter *cacheimport.CacheImporter
// // no frontend here
// }
type SubBuilder interface {
SubBuild(ctx context.Context, dgst digest.Digest, req types.SolveRequest) (types.Ref, error)
}
type Worker interface {
InstructionCache() instructioncache.InstructionCache
Resolve(v types.Vertex, s SubBuilder) (types.Op, error)
// ResolveVertex resolves Vertex.Sys() to Op implementation. SubBuilder is needed for pb.Op_Build.
ResolveVertex(v types.Vertex, s SubBuilder) (types.Op, error)
ResolveImageConfig(ctx context.Context, ref string) (digest.Digest, []byte, error)
// Exec is similar to executor.Exec but without []mount.Mount
Exec(ctx context.Context, meta executor.Meta, rootFS cache.ImmutableRef, stdin io.ReadCloser, stdout, stderr io.WriteCloser) error
DiskUsage(ctx context.Context, opt client.DiskUsageInfo) ([]*client.UsageInfo, error)
Name() string