From 18b1aec0eea9de82c360cedbb1e6c17711fa2a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Fri, 8 Dec 2023 16:47:56 +0100
Subject: [PATCH] c8d/inspect: Fill `Parent` property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this change `ParentId` was filled for images when calling the
`/images/json` (image list) endpoint but was not for the
`/images/<image>/json` (image inspect).

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 daemon/containerd/image.go         | 30 ++++++++++++++++++++++++++++++
 daemon/containerd/image_builder.go |  1 +
 2 files changed, 31 insertions(+)

diff --git a/daemon/containerd/image.go b/daemon/containerd/image.go
index 68c55b1812..ff677a8cd7 100644
--- a/daemon/containerd/image.go
+++ b/daemon/containerd/image.go
@@ -84,6 +84,14 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
 	ociimage := presentImages[0]
 
 	img := dockerOciImageToDockerImagePartial(image.ID(desc.Target.Digest), ociimage)
+
+	parent, err := i.getImageLabelByDigest(ctx, desc.Target.Digest, imageLabelClassicBuilderParent)
+	if err != nil {
+		log.G(ctx).WithError(err).Warn("failed to determine Parent property")
+	} else {
+		img.Parent = image.ID(parent)
+	}
+
 	if options.Details {
 		lastUpdated := time.Unix(0, 0)
 		size, err := i.size(ctx, desc.Target, platform)
@@ -352,3 +360,25 @@ func imageFamiliarName(img containerdimages.Image) string {
 	}
 	return img.Name
 }
+
+// getImageLabelByDigest will return the value of the label for images
+// targeting the specified digest.
+// If images have different values, an errdefs.Conflict error will be returned.
+func (i *ImageService) getImageLabelByDigest(ctx context.Context, target digest.Digest, labelKey string) (string, error) {
+	imgs, err := i.client.ImageService().List(ctx, "target.digest=="+target.String()+",label."+labelKey)
+	if err != nil {
+		return "", errdefs.System(err)
+	}
+
+	var value string
+	for _, img := range imgs {
+		if v, ok := img.Labels[labelKey]; ok {
+			if value != "" && value != v {
+				return value, errdefs.Conflict(fmt.Errorf("conflicting label value %q and %q", value, v))
+			}
+			value = v
+		}
+	}
+
+	return value, nil
+}
diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go
index 835e5d2b2f..e5ce3e39b9 100644
--- a/daemon/containerd/image_builder.go
+++ b/daemon/containerd/image_builder.go
@@ -37,6 +37,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+// Digest of the image which was the base image of the committed container.
 const imageLabelClassicBuilderParent = "org.mobyproject.image.parent"
 
 // GetImageAndReleasableLayer returns an image and releaseable layer for a