kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

containerd: Unpack loaded images 

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Paweł Gronowski 2022-07-07 13:54:50 +02:00 committed by Sebastiaan van Stijn
parent 50fb999bb1
commit 5c96365c94
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
daemon/containerd/image_exporter.go
View File

@ -8,6 +8,8 @@ import (
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/platforms"
"github.com/docker/distribution/reference"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
// ExportImage exports a list of images to the given output stream. The
@ -15,6 +17,8 @@ import (
// stream. All images with the given tag and all versions containing
// the same tag are exported. names is the set of tags to export, and
// outStream is the writer which the images are written to.
//
// TODO(thaJeztah): produce JSON stream progress response and image events; see https://github.com/moby/moby/issues/43910
func (i *ImageService) ExportImage(ctx context.Context, names []string, outStream io.Writer) error {
opts := []archive.ExportOpt{
archive.WithPlatform(platforms.Ordered(platforms.DefaultSpec())),
@ -34,9 +38,36 @@ 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 {
_, err := i.client.Import(ctx, inTar,
containerd.WithImportPlatform(platforms.DefaultStrict()),
)
return err
platform := platforms.DefaultStrict()
imgs, err := i.client.Import(ctx, inTar, containerd.WithImportPlatform(platform))
if err != nil {
// TODO(thaJeztah): remove this log or change to debug once we can; see https://github.com/moby/moby/pull/43822#discussion_r937502405
logrus.WithError(err).Warn("failed to import image to containerd")
return errors.Wrap(err, "failed to import image")
}
for _, img := range imgs {
platformImg := containerd.NewImageWithPlatform(i.client, img, platform)
unpacked, err := platformImg.IsUnpacked(ctx, containerd.DefaultSnapshotter)
if err != nil {
// TODO(thaJeztah): remove this log or change to debug once we can; see https://github.com/moby/moby/pull/43822#discussion_r937502405
logrus.WithError(err).WithField("image", img.Name).Debug("failed to check if image is unpacked")
continue
}
if !unpacked {
err := platformImg.Unpack(ctx, containerd.DefaultSnapshotter)
if err != nil {
// TODO(thaJeztah): remove this log or change to debug once we can; see https://github.com/moby/moby/pull/43822#discussion_r937502405
logrus.WithError(err).WithField("image", img.Name).Warn("failed to unpack image")
return errors.Wrap(err, "failed to unpack image")
}
}
}
return nil
}