InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add containerd image ref to created containers

Browse Source 
This populates the "Image" field on containerd containers, but only when
using the containerd image store.
This allows containerd clients to look up the image information.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Brian Goff
2024-01-28 19:43:44 +00:00
committed by Sebastiaan van Stijn
parent 812f319a57
commit 2851ddc44c
3 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon/start.go
View File

@@ -4,10 +4,13 @@ import (
"context"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/containers"
"github.com/containerd/log"
"github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/container"
mobyc8dstore "github.com/docker/docker/daemon/containerd"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/libcontainerd"
"github.com/pkg/errors"
@@ -173,7 +176,22 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
return err
}
ctr, err := libcontainerd.ReplaceContainer(ctx, daemon.containerd, container.ID, spec, shim, createOptions)
ctr, err := libcontainerd.ReplaceContainer(ctx, daemon.containerd, container.ID, spec, shim, createOptions, func(ctx context.Context, client *containerd.Client, c *containers.Container) error {
// Only set the image if we are using containerd for image storage.
// This is for metadata purposes only.
// Other lower-level components may make use of this information.
is, ok := daemon.imageService.(*mobyc8dstore.ImageService)
if !ok {
return nil
}
img, err := is.ResolveImage(ctx, container.Config.Image)
if err != nil {
log.G(ctx).WithError(err).WithField("container", container.ID).Warn("Failed to resolve containerd image reference")
return nil
}
c.Image = img.Name
return nil
})
if err != nil {
return setExitCodeFromError(container.SetExitCode, err)
}