Skip to content

Commit 0c01580

Browse files
authored
Merge pull request #6096 from tonistiigi/fix-named-context-created-time
dockerfile: fix created time taken from base image if named context used
2 parents 34a91d2 + 986ff4e commit 0c01580

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

frontend/dockerfile/dockerfile2llb/convert.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,7 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS
484484
d.dispatched = true
485485
d.state = *st
486486
if img != nil {
487-
// timestamps are inherited as-is, regardless to SOURCE_DATE_EPOCH
488-
// https://github.com/moby/buildkit/issues/4614
487+
img.Created = nil
489488
d.image = *img
490489
if img.Architecture != "" && img.OS != "" {
491490
d.platform = &ocispecs.Platform{
@@ -516,11 +515,13 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS
516515
if err != nil {
517516
return err
518517
}
519-
if img != nil {
520-
d.image = *img
521-
} else {
522-
d.image = emptyImage(platformOpt.targetPlatform)
518+
if img == nil {
519+
imgp := emptyImage(*platform)
520+
img = &imgp
523521
}
522+
d.baseImg = cloneX(img) // immutable
523+
img.Created = nil
524+
d.image = *img
524525
d.state = st.Platform(*platform)
525526
d.platform = platform
526527
return nil

0 commit comments

Comments
 (0)