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

Merge pull request #45678 from thaJeztah/24.0_backport_fix_snapshotter_change

Browse source 
[24.0 backport] Make sure the image is unpacked for the current snapshotter
This commit is contained in:
Sebastiaan van Stijn 2023-06-02 13:17:54 +02:00 committed by GitHub
commit 4b3329d3dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
daemon/containerd/image_snapshot.go
View file

@ -3,6 +3,7 @@ package containerd
import (
"context"
"github.com/containerd/containerd"
containerdimages "github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/platforms"
@ -12,7 +13,7 @@ import (
// PrepareSnapshot prepares a snapshot from a parent image for a container
func (i *ImageService) PrepareSnapshot(ctx context.Context, id string, parentImage string, platform *ocispec.Platform) error {
desc, err := i.resolveDescriptor(ctx, parentImage)
img, err := i.resolveImage(ctx, parentImage)
if err != nil {
return err
}
@ -24,7 +25,19 @@ func (i *ImageService) PrepareSnapshot(ctx context.Context, id string, parentIma
matcher = platforms.Only(*platform)
}
desc, err = containerdimages.Config(ctx, cs, desc, matcher)
platformImg := containerd.NewImageWithPlatform(i.client, img, matcher)
unpacked, err := platformImg.IsUnpacked(ctx, i.snapshotter)
if err != nil {
return err
}
if !unpacked {
if err := platformImg.Unpack(ctx, i.snapshotter); err != nil {
return err
}
}
desc, err := containerdimages.Config(ctx, cs, img.Target, matcher)
if err != nil {
return err
}