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

Merge pull request #217 from tonistiigi/ctx-fix 

dockerfile: fix wrong context passed to build
docker-18.09
Akihiro Suda 2017-12-14 14:36:29 +09:00 committed by GitHub
parent 8fa227c801 5d457719be
commit bbb05c98cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/dockerfile/dockerfile.go
View File

@ -4,7 +4,6 @@ import (
"github.com/moby/buildkit/cache" "github.com/moby/buildkit/cache"
"github.com/moby/buildkit/frontend" "github.com/moby/buildkit/frontend"
"github.com/moby/buildkit/frontend/dockerfile/builder" "github.com/moby/buildkit/frontend/dockerfile/builder"
"github.com/moby/buildkit/util/appcontext"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
@ -30,7 +29,7 @@ func (f *dfFrontend) Solve(ctx context.Context, llbBridge frontend.FrontendLLBBr
} }
}() }()
if err := builder.Build(appcontext.Context(), c); err != nil { if err := builder.Build(ctx, c); err != nil {
return nil, nil, err return nil, nil, err
} }