diff --git a/daemon/containerd/image_exporter.go b/daemon/containerd/image_exporter.go index 44fada7c465861dbf30b2c4a9005804462b42da1..59aa1d4ccf3d4b2c5ddeacae7064cac326b6de06 100644 --- a/daemon/containerd/image_exporter.go +++ b/daemon/containerd/image_exporter.go @@ -102,8 +102,6 @@ func (i *ImageService) ExportImage(ctx context.Context, names []string, outStrea // LoadImage uploads a set of images into the repository. This is the // complement of ExportImage. The input stream is an uncompressed tar // ball containing images and metadata. -// -// TODO(thaJeztah): produce JSON stream progress response and image events; see https://github.com/moby/moby/issues/43910 func (i *ImageService) LoadImage(ctx context.Context, inTar io.ReadCloser, outStream io.Writer, quiet bool) error { // TODO(vvoland): Allow user to pass platform platform := cplatforms.All @@ -153,7 +151,9 @@ func (i *ImageService) LoadImage(ctx context.Context, inTar io.ReadCloser, outSt } fmt.Fprintf(progress, "Loaded image: %s\n", name) + i.LogImageEvent(img.Target.Digest.String(), img.Target.Digest.String(), "load") } + return nil } diff --git a/daemon/containerd/image_import.go b/daemon/containerd/image_import.go index bbb989d6668ebf13212cdba919e6a7d47b876a8f..592c7f294ebd63dafd26e5a1af0d549f274ff67f 100644 --- a/daemon/containerd/image_import.go +++ b/daemon/containerd/image_import.go @@ -146,6 +146,8 @@ func (i *ImageService) ImportImage(ctx context.Context, ref reference.Named, pla err = i.unpackImage(ctx, img, *platform) if err != nil { logger.WithError(err).Debug("failed to unpack image") + } else { + i.LogImageEvent(id.String(), id.String(), "import") } return id, err