move rw to opt; make snapshot opt; move to NewContainerOpts

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

container_checkpoint_opts.go

@@ -17,6 +17,7 @@
 package containerd
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"runtime"
@@ -24,6 +25,7 @@ import (
 	tasks "github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/diff"
+	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/rootfs"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/typeurl"
@@ -78,23 +80,35 @@ func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Conta
 	return nil
 }
 
+// WithCheckpointRuntime includes the container runtime info
+func WithCheckpointRuntime(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error {
+	if c.Runtime.Options != nil {
+		data, err := c.Runtime.Options.Marshal()
+		if err != nil {
+			return err
+		}
+		r := bytes.NewReader(data)
+		desc, err := writeContent(ctx, client.ContentStore(), images.MediaTypeContainerd1CheckpointRuntimeOptions, c.ID+"-runtime-options", r)
+		if err != nil {
+			return err
+		}
+		desc.Platform = &imagespec.Platform{
+			OS:           runtime.GOOS,
+			Architecture: runtime.GOARCH,
+		}
+		index.Manifests = append(index.Manifests, desc)
+	}
+	return nil
+}
+
 // WithCheckpointRW includes the rw in the checkpoint
 func WithCheckpointRW(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error {
-	cnt, err := client.LoadContainer(ctx, c.ID)
-	if err != nil {
-		return err
-	}
-	info, err := cnt.Info(ctx)
-	if err != nil {
-		return err
-	}
-
 	diffOpts := []diff.Opt{
-		diff.WithReference(fmt.Sprintf("checkpoint-rw-%s", info.SnapshotKey)),
+		diff.WithReference(fmt.Sprintf("checkpoint-rw-%s", c.SnapshotKey)),
 	}
 	rw, err := rootfs.CreateDiff(ctx,
-		info.SnapshotKey,
-		client.SnapshotService(info.Snapshotter),
+		c.SnapshotKey,
+		client.SnapshotService(c.Snapshotter),
 		client.DiffService(),
 		diffOpts...,
 	)