fix(stapel): discarding newly built image might break reproducibility of subsequent stages

alexey-igrychev · alexey-igrychev · commit 78d2905ca1ef · 2024-03-29T11:57:11.000Z
Signed-off-by: Aleksei Igrychev &lt;aleksei.igrychev@palark.com&gt;
diff --git a/pkg/build/build_phase.go b/pkg/build/build_phase.go
@@ -1137,6 +1137,9 @@ func (phase *BuildPhase) atomicBuildStageImage(ctx context.Context, img *image.I
 			i.Image.SetStageDescription(stageDesc)
 			stg.SetStageImage(i)
 
+			// The stage digest is equal but stage content digest might be different.
+			stg.SetContentDigest(stageDesc.Info.Labels[imagePkg.WerfStageContentDigestLabel])
+
 			return nil
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1137,6 +1137,9 @@ func (phase BuildPhase) atomicBuildStageImage(ctx context.Context, img image.I`
`1137`	`1137`	`i.Image.SetStageDescription(stageDesc)`
`1138`	`1138`	`stg.SetStageImage(i)`
`1139`	`1139`
	`1140`	`+ // The stage digest is equal but stage content digest might be different.`
	`1141`	`+ stg.SetContentDigest(stageDesc.Info.Labels[imagePkg.WerfStageContentDigestLabel])`
	`1142`	`+`
`1140`	`1143`	`return nil`
`1141`	`1144`	`}`
`1142`	`1145`