Merge pull request #4192 from goller/fix/merge-diff-cachemap-digest

fix: use sha256 for merge/diff op cache maps
moby · Sep 12, 2023 · fca54c9 · fca54c9
2 parents c8ac872 + a49c9c0
commit fca54c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/solver/llbsolver/ops/diff.go b/solver/llbsolver/ops/diff.go
@@ -55,7 +55,7 @@ func (d *diffOp) CacheMap(ctx context.Context, group session.Group, index int) (
 	}
 
 	cm := &solver.CacheMap{
-		Digest: digest.Digest(dt),
+		Digest: digest.FromBytes(dt),
 		Deps: make([]struct {
 			Selector          digest.Digest
 			ComputeDigestFunc solver.ResultBasedCacheFunc

diff --git a/solver/llbsolver/ops/merge.go b/solver/llbsolver/ops/merge.go
@@ -47,7 +47,7 @@ func (m *mergeOp) CacheMap(ctx context.Context, group session.Group, index int)
 	}
 
 	cm := &solver.CacheMap{
-		Digest: digest.Digest(dt),
+		Digest: digest.FromBytes(dt),
 		Deps: make([]struct {
 			Selector          digest.Digest
 			ComputeDigestFunc solver.ResultBasedCacheFunc