kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #137 from dagger/local-cache

Browse Source 
Fix caching issues with Local
This commit is contained in:
Andrea Luzzardi 2021-02-24 16:19:55 -08:00 committed by GitHub
commit 4a4c0da0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dagger/pipeline.go
View File

@ -253,14 +253,33 @@ func (p *Pipeline) Local(ctx context.Context, op *compiler.Value) error {
return err
}
}
// FIXME: Remove the `Copy` and use `Local` directly.
//
// Copy'ing is a costly operation which should be unnecessary.
// However, for a mysterious reason, `llb.Local` is returning a different
// digest at every run, therefore invalidating the cache.
//
// By wrapping `llb.Local` inside `llb.Copy`, we get the same digest for
// the same content.
p.fs = p.fs.Change(func(st llb.State) llb.State {
return st.File(
llb.Copy(
llb.Local(
dir,
llb.FollowPaths(include),
llb.WithCustomName(p.vertexNamef("Local %s", dir)),
// Without hint, multiple `llb.Local` operations on the
// same path get a different digest.
llb.SessionID(p.s.SessionID()),
llb.SharedKeyHint(dir),
),
"/",
"/",
),
)
})
p.fs = p.fs.Set(
llb.Local(
dir,
llb.FollowPaths(include),
llb.WithCustomName(p.vertexNamef("Local %s", dir)),
),
)
return nil
}

4
dagger/solver.go
View File

@ -35,6 +35,10 @@ func (s Solver) Scratch() FS {
return s.FS(llb.Scratch())
}
func (s Solver) SessionID() string {
return s.c.BuildOpts().SessionID
}
// Solve will block until the state is solved and returns a Reference.
func (s Solver) SolveRequest(ctx context.Context, req bkgw.SolveRequest) (bkgw.Reference, error) {
// call solve