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

tonistiigi · web-flow · commit fca54c908e7f · 2023-09-12T13:09:57.000-07:00
fix: use sha256 for merge/diff op cache maps
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

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (d *diffOp) CacheMap(ctx context.Context, group session.Group, index int) (`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`cm := &solver.CacheMap{`
`58`		`- Digest: digest.Digest(dt),`
	`58`	`+ Digest: digest.FromBytes(dt),`
`59`	`59`	`Deps: make([]struct {`
`60`	`60`	`Selector digest.Digest`
`61`	`61`	`ComputeDigestFunc solver.ResultBasedCacheFunc`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (m *mergeOp) CacheMap(ctx context.Context, group session.Group, index int)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`cm := &solver.CacheMap{`
`50`		`- Digest: digest.Digest(dt),`
	`50`	`+ Digest: digest.FromBytes(dt),`
`51`	`51`	`Deps: make([]struct {`
`52`	`52`	`Selector digest.Digest`
`53`	`53`	`ComputeDigestFunc solver.ResultBasedCacheFunc`