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

dockerfile: add cache-from support 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-04-25 15:22:49 -07:00
parent 11ada4c27b
commit 966d3f7b32
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/dockerfile/builder/build.go
View File

@ -20,6 +20,7 @@ const (
LocalNameDockerfile = "dockerfile"
keyTarget = "target"
keyFilename = "filename"
keyCacheFrom = "cache-from"
exporterImageConfig = "containerimage.config"
defaultDockerfileName = "Dockerfile"
dockerignoreFilename = ".dockerignore"
@ -57,7 +58,7 @@ func Build(ctx context.Context, c client.Client) error {
eg, ctx2 := errgroup.WithContext(ctx)
var dtDockerfile []byte
eg.Go(func() error {
ref, err := c.Solve(ctx2, def.ToPB(), "", "", nil, false)
ref, err := c.Solve(ctx2, def.ToPB(), "", nil, nil, false)
if err != nil {
return err
}
@ -83,7 +84,7 @@ func Build(ctx context.Context, c client.Client) error {
if err != nil {
return err
}
ref, err := c.Solve(ctx2, def.ToPB(), "", "", nil, false)
ref, err := c.Solve(ctx2, def.ToPB(), "", nil, nil, false)
if err != nil {
return err
}
@ -125,7 +126,12 @@ func Build(ctx context.Context, c client.Client) error {
return err
}
_, err = c.Solve(ctx, def.ToPB(), "", opts["cache-from"], map[string][]byte{
var cacheFrom []string
if cacheFromStr := opts[keyCacheFrom]; cacheFromStr != "" {
cacheFrom = strings.Split(cacheFromStr, ",")
}
_, err = c.Solve(ctx, def.ToPB(), "", cacheFrom, map[string][]byte{
exporterImageConfig: config,
}, true)
if err != nil {

4
frontend/dockerfile/forward.go
View File

@ -26,11 +26,11 @@ type bridgeClient struct {
refs []*ref
}
func (c *bridgeClient) Solve(ctx context.Context, def *pb.Definition, f string, importRef string, exporterAttr map[string][]byte, final bool) (client.Reference, error) {
func (c *bridgeClient) Solve(ctx context.Context, def *pb.Definition, f string, cacheImportRefs []string, exporterAttr map[string][]byte, final bool) (client.Reference, error) {
r, exporterAttrRes, err := c.FrontendLLBBridge.Solve(ctx, frontend.SolveRequest{
Definition: def,
Frontend: f,
ImportCacheRef: importRef,
ImportCacheRefs: cacheImportRefs,
})
if err != nil {
return nil, err

2
frontend/gateway/client/client.go
View File

@ -9,7 +9,7 @@ import (
// TODO: make this take same options as LLBBridge. Add Return()
type Client interface {
Solve(ctx context.Context, def *pb.Definition, frontend string, importRef string, exporterAttr map[string][]byte, final bool) (Reference, error)
Solve(ctx context.Context, def *pb.Definition, frontend string, cacheImportRefs []string, exporterAttr map[string][]byte, final bool) (Reference, error)
ResolveImageConfig(ctx context.Context, ref string) (digest.Digest, []byte, error)
Opts() map[string]string
SessionID() string

8
solver-next/llbsolver/bridge.go
View File

@ -6,6 +6,7 @@ import (
"strings"
"sync"
"github.com/docker/distribution/reference"
"github.com/moby/buildkit/cache"
"github.com/moby/buildkit/cache/cacheimport"
"github.com/moby/buildkit/executor"
@ -32,6 +33,12 @@ func (b *llbBridge) Solve(ctx context.Context, req frontend.SolveRequest) (res s
b.cmsMu.Lock()
var cm solver.CacheManager
if prevCm, ok := b.cms[ref]; !ok {
r, err := reference.ParseNormalizedNamed(ref)
if err != nil {
return nil, nil, err
}
ref = reference.TagNameOnly(r).String()
func(ref string) {
cm = newLazyCacheManager(ref, func() (solver.CacheManager, error) {
var cmNew solver.CacheManager
if err := b.builder.Call(ctx, "importing cache manifest from "+ref, func(ctx context.Context) error {
@ -42,6 +49,7 @@ func (b *llbBridge) Solve(ctx context.Context, req frontend.SolveRequest) (res s
}
return cmNew, nil
})
}(ref)
b.cms[ref] = cm
} else {
cm = prevCm