From f22b11200509155f541bc2d7516d79dad4af2df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 25 Aug 2023 16:17:47 +0200 Subject: [PATCH] c8d/commit: Unpack committed image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- daemon/containerd/image_commit.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/daemon/containerd/image_commit.go b/daemon/containerd/image_commit.go index e9ba7983c6..09414b723d 100644 --- a/daemon/containerd/image_commit.go +++ b/daemon/containerd/image_commit.go @@ -120,7 +120,17 @@ func (i *ImageService) CommitImage(ctx context.Context, cc backend.CommitConfig) return "", fmt.Errorf("failed to create new image: %w", err) } } - return image.ID(img.Target.Digest), nil + id := image.ID(img.Target.Digest) + + c8dImg, err := i.NewImageManifest(ctx, img, commitManifestDesc) + if err != nil { + return id, err + } + if err := c8dImg.Unpack(ctx, container.Driver); err != nil && !cerrdefs.IsAlreadyExists(err) { + return id, fmt.Errorf("failed to unpack image: %w", err) + } + + return id, nil } // generateCommitImageConfig generates an OCI Image config based on the