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

Merge pull request #230 from AkihiroSuda/sed-resolve-vertex 

worker, solver: s/ResolveVertex/ResolveOp/g
docker-18.09
Tõnis Tiigi 2017-12-18 21:54:43 -08:00 committed by GitHub
parent 25dca1f5e3 dca082582e
commit ff9d77a7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 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 { if err != nil {
return nil, err return nil, err
} }
return w.ResolveVertex(v, s) return w.ResolveOp(v, s)
}, opt.WorkerController, determineVertexWorker, opt.Frontends, opt.CacheExporter, opt.CacheImporter) }, opt.WorkerController, determineVertexWorker, opt.Frontends, opt.CacheExporter, opt.CacheImporter)
return s return s
} }

2
worker/base/worker.go
View File

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

4
worker/worker.go
View File

@ -19,8 +19,8 @@ type SubBuilder interface {
type Worker interface { type Worker interface {
InstructionCache() instructioncache.InstructionCache InstructionCache() instructioncache.InstructionCache
// ResolveVertex resolves Vertex.Sys() to Op implementation. SubBuilder is needed for pb.Op_Build. // ResolveOp resolves Vertex.Sys() to Op implementation. SubBuilder is needed for pb.Op_Build.
ResolveVertex(v types.Vertex, s SubBuilder) (types.Op, error) ResolveOp(v types.Vertex, s SubBuilder) (types.Op, error)
ResolveImageConfig(ctx context.Context, ref string) (digest.Digest, []byte, error) ResolveImageConfig(ctx context.Context, ref string) (digest.Digest, []byte, error)
// Exec is similar to executor.Exec but without []mount.Mount // 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 Exec(ctx context.Context, meta executor.Meta, rootFS cache.ImmutableRef, stdin io.ReadCloser, stdout, stderr io.WriteCloser) error