feat: donot unpack image when upload

Signed-off-by: zwtop <[email protected]>

Author: zwtop

client/clienttest/runtime.go

@@ -48,11 +48,12 @@ func NewRuntime(followWaitTime time.Duration) client.Runtime {
 	}
 }
 
-func (r *runtime) Platform() platforms.MatchComparer     { return platforms.All }
-func (r *runtime) ContainerdClient() *containerd.Client  { return &containerd.Client{} }
-func (r *runtime) Namespace() string                     { return "unknown" }
-func (r *runtime) ConfigRuntime(context.Context) error   { return nil }
-func (r *runtime) RemoveNamespace(context.Context) error { return nil }
+func (r *runtime) Platform() platforms.MatchComparer         { return platforms.All }
+func (r *runtime) ContainerdClient() *containerd.Client      { return &containerd.Client{} }
+func (r *runtime) Namespace() string                         { return "unknown" }
+func (r *runtime) ConfigRuntime(context.Context) error       { return nil }
+func (r *runtime) RemoveNamespace(context.Context) error     { return nil }
+func (r *runtime) UnpackImage(context.Context, string) error { return nil }
 
 func (r *runtime) RecommendedRuntimeInfo(context.Context, *model.Container) *containers.RuntimeInfo {
 	return &containers.RuntimeInfo{}

client/interface.go

@@ -66,6 +66,9 @@ type ImageManager interface {
 	// RemoveImage remove an image from containerd
 	RemoveImage(ctx context.Context, ref string) error
 
+	// UnpackImage unpack an image in containerd
+	UnpackImage(ctx context.Context, ref string) error
+
 	// GetImage return image details
 	GetImage(ctx context.Context, ref string) (*images.Image, bool, error)
 }

client/runtime.go

@@ -181,15 +181,10 @@ func (r *runtime) ImportImages(ctx context.Context, refs ...string) error {
 
 	for _, ref := range refs {
 		// fix: pull with unpack do not fetch missing contents
-		img, err := r.client.Fetch(ctx, ref, containerd.WithPlatformMatcher(r.platform), containerd.WithResolver(r.resolver))
+		_, err := r.client.Fetch(ctx, ref, containerd.WithPlatformMatcher(r.platform), containerd.WithResolver(r.resolver))
 		if err != nil {
 			return fmt.Errorf("import %s: %w", ref, err)
 		}
-
-		err = containerd.NewImageWithPlatform(r.client, img, r.platform).Unpack(ctx, containerd.DefaultSnapshotter)
-		if err != nil {
-			return fmt.Errorf("unpack %s: %w", ref, err)
-		}
 	}
 	return nil
 }
@@ -205,6 +200,15 @@ func (r *runtime) RemoveImage(ctx context.Context, ref string) error {
 	return ignoreNotFoundError(err)
 }
 
+func (r *runtime) UnpackImage(ctx context.Context, ref string) error {
+	ctx = namespaces.WithNamespace(ctx, r.namespace)
+	img, err := r.getImage(ctx, ref)
+	if err != nil {
+		return err
+	}
+	return unpackImage(ctx, img, containerd.DefaultSnapshotter)
+}
+
 func (r *runtime) GetImage(ctx context.Context, ref string) (*images.Image, bool, error) {
 	ctx = namespaces.WithNamespace(ctx, r.namespace)
 
@@ -549,22 +553,27 @@ func withoutAnyMounts() oci.SpecOpts {
 func withNewSnapshotAndConfig(img containerd.Image, configContent []model.ConfigFile) containerd.NewContainerOpts {
 	return func(ctx context.Context, client *containerd.Client, c *containers.Container) error {
 		var (
-			snapshotID = rand.String(10)
-			data       = toRawConfig(configContent)
-			descriptor = v1.Descriptor{
+			snapshotID      = rand.String(10)
+			snapshotterName = containerd.DefaultSnapshotter
+			data            = toRawConfig(configContent)
+			descriptor      = v1.Descriptor{
 				MediaType: v1.MediaTypeImageLayer,
 				Digest:    digest.SHA256.FromBytes(data),
 				Size:      int64(len(data)),
 			}
 			ref = fmt.Sprintf("ingest-%s", descriptor.Digest)
 		)
 
-		diffIDs, err := img.RootFS(ctx)
+		err := unpackImage(ctx, img, snapshotterName)
 		if err != nil {
 			return err
 		}
 
-		mounts, err := client.SnapshotService(containerd.DefaultSnapshotter).Prepare(ctx, snapshotID, identity.ChainID(diffIDs).String())
+		diffIDs, err := img.RootFS(ctx)
+		if err != nil {
+			return err
+		}
+		mounts, err := client.SnapshotService(snapshotterName).Prepare(ctx, snapshotID, identity.ChainID(diffIDs).String())
 		if err != nil {
 			return err
 		}
@@ -734,3 +743,16 @@ func withAllowAllDevices(_ context.Context, _ oci.Client, _ *containers.Containe
 	}
 	return nil
 }
+
+func unpackImage(ctx context.Context, img containerd.Image, snapshotterName string) error {
+	unpacked, err := img.IsUnpacked(ctx, snapshotterName)
+	if err != nil {
+		return err
+	}
+	if !unpacked {
+		if err := img.Unpack(ctx, snapshotterName); err != nil {
+			return err
+		}
+	}
+	return nil
+}