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

pipeline: FetchGit: make a copy of the content to avoid caching issues

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-03-18 11:18:06 -07:00
parent 6cecde59fd
commit 5b1e7eeacf
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dagger/pipeline.go
View File

@ -312,11 +312,7 @@ func (p *Pipeline) Local(ctx context.Context, op *compiler.Value, st llb.State)
// FIXME: Remove the `Copy` and use `Local` directly. // FIXME: Remove the `Copy` and use `Local` directly.
// //
// Copy'ing is a costly operation which should be unnecessary. // Copy'ing is a costly operation which should be unnecessary.
// However, for a mysterious reason, `llb.Local` is returning a different // However, using llb.Local directly breaks caching sometimes for unknown reasons.
// digest at every run, therefore invalidating the cache.
//
// By wrapping `llb.Local` inside `llb.Copy`, we get the same digest for
// the same content.
return st.File( return st.File(
llb.Copy( llb.Copy(
llb.Local( llb.Local(
@ -624,10 +620,22 @@ func (p *Pipeline) FetchGit(ctx context.Context, op *compiler.Value, st llb.Stat
if err != nil { if err != nil {
return st, err return st, err
} }
return llb.Git(
// FIXME: Remove the `Copy` and use `Git` directly.
//
// Copy'ing is a costly operation which should be unnecessary.
// However, using llb.Git directly breaks caching sometimes for unknown reasons.
return st.File(
llb.Copy(
llb.Git(
remote, remote,
ref, ref,
llb.WithCustomName(p.vertexNamef("FetchGit %s@%s", remote, ref)), llb.WithCustomName(p.vertexNamef("FetchGit %s@%s", remote, ref)),
),
"/",
"/",
),
llb.WithCustomName(p.vertexNamef("FetchGit %s@%s [copy]", remote, ref)),
), nil ), nil
} }