feat: donot unpack image when upload

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

Author: zwtop

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
 }
@@ -549,9 +544,10 @@ 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)),
@@ -564,7 +560,17 @@ func withNewSnapshotAndConfig(img containerd.Image, configContent []model.Config
 			return err
 		}
 
-		mounts, err := client.SnapshotService(containerd.DefaultSnapshotter).Prepare(ctx, snapshotID, identity.ChainID(diffIDs).String())
+		unpacked, err := img.IsUnpacked(ctx, snapshotterName)
+		if err != nil {
+			return err
+		}
+		if !unpacked {
+			if err := img.Unpack(ctx, snapshotterName); err != nil {
+				return err
+			}
+		}
+
+		mounts, err := client.SnapshotService(snapshotterName).Prepare(ctx, snapshotID, identity.ChainID(diffIDs).String())
 		if err != nil {
 			return err
 		}