0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45259 from rumpl/c8d-load-save-events

Browse source 
c8d: Send event when an image is imported
This commit is contained in:
Sebastiaan van Stijn 2023-04-03 20:05:45 +02:00 • committed by GitHub
commit 816cd9802f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/containerd/image_exporter.go
View file

@ -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
}

2
daemon/containerd/image_import.go
View file

@ -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