Merge branch 'main' into test-branch

Author: craigloewen-msft

cmd/nerdctl/container/container_export.go

@@ -3,13 +3,15 @@ package container
 import (
 	"fmt"
 	"os"
+
+	"github.com/mattn/go-isatty"
+	"github.com/spf13/cobra"
+
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"
-	"github.com/mattn/go-isatty"
-	"github.com/spf13/cobra"
 )
 
 func ExportCommand() *cobra.Command {

pkg/cmd/container/export.go

@@ -24,11 +24,11 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
+	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/pkg/archive"
 	"github.com/containerd/log"
 
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
-	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
 )
 
@@ -66,7 +66,7 @@ func exportContainer(ctx context.Context, client *containerd.Client, container c
 			return fmt.Errorf("failed to get container info: %w", err)
 		}
 
-		root, cleanup, err = containerutil.MountSnapshotForContainer(ctx, client, conInfo, options.GOptions.Snapshotter)
+		root, cleanup, err = MountSnapshotForContainer(ctx, client, conInfo, options.GOptions.Snapshotter)
 		if cleanup != nil {
 			defer func() {
 				if cleanupErr := cleanup(); cleanupErr != nil {
@@ -162,3 +162,31 @@ func (cw *countingWriter) Write(p []byte) (n int, err error) {
 	cw.count += int64(n)
 	return n, err
 }
+
+func MountSnapshotForContainer(ctx context.Context, client *containerd.Client, conInfo containers.Container, snapshotter string) (string, func() error, error) {
+	snapKey := conInfo.SnapshotKey
+	resp, err := client.SnapshotService(snapshotter).Mounts(ctx, snapKey)
+	if err != nil {
+		return "", nil, err
+	}
+
+	tempDir, err := os.MkdirTemp("", "nerdctl-cp-")
+	if err != nil {
+		return "", nil, err
+	}
+
+	err = mount.All(resp, tempDir)
+	if err != nil {
+		return "", nil, err
+	}
+
+	cleanup := func() error {
+		err = mount.Unmount(tempDir, 0)
+		if err != nil {
+			return err
+		}
+		return os.RemoveAll(tempDir)
+	}
+
+	return tempDir, cleanup, nil
+}