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

gateway: typo fix 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-03-08 10:08:32 -08:00
parent abe6627919
commit 12fd7edc24
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/gateway/gateway.go
View File

@ -119,7 +119,7 @@ func (gf *gatewayFrontend) Solve(ctx context.Context, llbBridge frontend.Fronten
rootFS = ref rootFS = ref
} }
lbf, err := newLLBBrideForwarder(ctx, llbBridge) lbf, err := newLLBBridgeForwarder(ctx, llbBridge)
defer lbf.conn.Close() defer lbf.conn.Close()
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@ -166,8 +166,8 @@ func (gf *gatewayFrontend) Solve(ctx context.Context, llbBridge frontend.Fronten
return lbf.lastRef, lbf.exporterAttr, nil return lbf.lastRef, lbf.exporterAttr, nil
} }
func newLLBBrideForwarder(ctx context.Context, llbBridge frontend.FrontendLLBBridge) (*llbBrideForwarder, error) { func newLLBBridgeForwarder(ctx context.Context, llbBridge frontend.FrontendLLBBridge) (*llbBridgeForwarder, error) {
lbf := &llbBrideForwarder{ lbf := &llbBridgeForwarder{
callCtx: ctx, callCtx: ctx,
llbBridge: llbBridge, llbBridge: llbBridge,
refs: map[string]cache.ImmutableRef{}, refs: map[string]cache.ImmutableRef{},
@ -236,7 +236,7 @@ func (d dummyAddr) String() string {
return "localhost" return "localhost"
} }
type llbBrideForwarder struct { type llbBridgeForwarder struct {
callCtx context.Context callCtx context.Context
llbBridge frontend.FrontendLLBBridge llbBridge frontend.FrontendLLBBridge
refs map[string]cache.ImmutableRef refs map[string]cache.ImmutableRef
@ -245,7 +245,7 @@ type llbBrideForwarder struct {
*pipe *pipe
} }
func (lbf *llbBrideForwarder) ResolveImageConfig(ctx netcontext.Context, req *pb.ResolveImageConfigRequest) (*pb.ResolveImageConfigResponse, error) { func (lbf *llbBridgeForwarder) ResolveImageConfig(ctx netcontext.Context, req *pb.ResolveImageConfigRequest) (*pb.ResolveImageConfigResponse, error) {
ctx = tracing.ContextWithSpanFromContext(ctx, lbf.callCtx) ctx = tracing.ContextWithSpanFromContext(ctx, lbf.callCtx)
dgst, dt, err := lbf.llbBridge.ResolveImageConfig(ctx, req.Ref) dgst, dt, err := lbf.llbBridge.ResolveImageConfig(ctx, req.Ref)
if err != nil { if err != nil {
@ -257,7 +257,7 @@ func (lbf *llbBrideForwarder) ResolveImageConfig(ctx netcontext.Context, req *pb
}, nil }, nil
} }
func (lbf *llbBrideForwarder) Solve(ctx netcontext.Context, req *pb.SolveRequest) (*pb.SolveResponse, error) { func (lbf *llbBridgeForwarder) Solve(ctx netcontext.Context, req *pb.SolveRequest) (*pb.SolveResponse, error) {
ctx = tracing.ContextWithSpanFromContext(ctx, lbf.callCtx) ctx = tracing.ContextWithSpanFromContext(ctx, lbf.callCtx)
ref, expResp, err := lbf.llbBridge.Solve(ctx, frontend.SolveRequest{ ref, expResp, err := lbf.llbBridge.Solve(ctx, frontend.SolveRequest{
Definition: req.Definition, Definition: req.Definition,
@ -289,7 +289,7 @@ func (lbf *llbBrideForwarder) Solve(ctx netcontext.Context, req *pb.SolveRequest
} }
return &pb.SolveResponse{Ref: id}, nil return &pb.SolveResponse{Ref: id}, nil
} }
func (lbf *llbBrideForwarder) ReadFile(ctx netcontext.Context, req *pb.ReadFileRequest) (*pb.ReadFileResponse, error) { func (lbf *llbBridgeForwarder) ReadFile(ctx netcontext.Context, req *pb.ReadFileRequest) (*pb.ReadFileResponse, error) {
ctx = tracing.ContextWithSpanFromContext(ctx, lbf.callCtx) ctx = tracing.ContextWithSpanFromContext(ctx, lbf.callCtx)
ref, ok := lbf.refs[req.Ref] ref, ok := lbf.refs[req.Ref]
if !ok { if !ok {
@ -306,7 +306,7 @@ func (lbf *llbBrideForwarder) ReadFile(ctx netcontext.Context, req *pb.ReadFileR
return &pb.ReadFileResponse{Data: dt}, nil return &pb.ReadFileResponse{Data: dt}, nil
} }
func (lbf *llbBrideForwarder) Ping(netcontext.Context, *pb.PingRequest) (*pb.PongResponse, error) { func (lbf *llbBridgeForwarder) Ping(netcontext.Context, *pb.PingRequest) (*pb.PongResponse, error) {
return &pb.PongResponse{}, nil return &pb.PongResponse{}, nil
} }