Merge pull request #45502 from laurazard/backport-c8d-image-history

[24.0 backport] Backport c8d image history

daemon/containerd/image.go

@@ -68,6 +68,21 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
 		exposedPorts[nat.Port(k)] = v
 	}
 
+	var imgHistory []image.History
+	for _, h := range ociimage.History {
+		var created time.Time
+		if h.Created != nil {
+			created = *h.Created
+		}
+		imgHistory = append(imgHistory, image.History{
+			Created:    created,
+			Author:     h.Author,
+			CreatedBy:  h.CreatedBy,
+			Comment:    h.Comment,
+			EmptyLayer: h.EmptyLayer,
+		})
+	}
+
 	img := image.NewImage(image.ID(desc.Digest))
 	img.V1Image = image.V1Image{
 		ID:           string(desc.Digest),
@@ -87,6 +102,7 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
 	}
 
 	img.RootFS = rootfs
+	img.History = imgHistory
 
 	if options.Details {
 		lastUpdated := time.Unix(0, 0)

daemon/containerd/image_commit.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/containerd/containerd/content"
@@ -143,7 +144,7 @@ func generateCommitImageConfig(baseConfig ocispec.Image, diffID digest.Digest, o
 		},
 		History: append(baseConfig.History, ocispec.History{
 			Created:    &createdTime,
-			CreatedBy:  "", // FIXME(ndeloof) ?
+			CreatedBy:  strings.Join(opts.ContainerConfig.Cmd, " "),
 			Author:     opts.Author,
 			Comment:    opts.Comment,
 			EmptyLayer: diffID == "",