Move content to core/content

Signed-off-by: Derek McGowan <derek@mcg.dev>

pkg/cri/server/images/service.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	containerd "github.com/containerd/containerd/v2/client"
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/events"
 	"github.com/containerd/containerd/v2/images"
 	criconfig "github.com/containerd/containerd/v2/pkg/cri/config"

pkg/cri/store/image/image.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/usage"

pkg/display/manifest_printer.go

@@ -25,7 +25,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

pkg/transfer/archive/exporter.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/containerd/containerd/v2/api/types"
 	transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/archive"
 	"github.com/containerd/containerd/v2/pkg/streaming"

pkg/transfer/archive/importer.go

@@ -24,7 +24,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
 	transferapi "github.com/containerd/containerd/v2/api/types/transfer"
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images/archive"
 	"github.com/containerd/containerd/v2/pkg/streaming"
 	tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming"

pkg/transfer/image/imagestore.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/containerd/containerd/v2/api/types"
 	transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/images/archive"

pkg/transfer/local/import.go

@@ -23,7 +23,7 @@ import (
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/pkg/transfer"

pkg/transfer/local/progress.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/pkg/transfer"
 	"github.com/containerd/containerd/v2/remotes"
 	"github.com/containerd/log"

pkg/transfer/local/pull.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"

pkg/transfer/local/push.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/pkg/transfer"

pkg/transfer/local/transfer.go

@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/typeurl/v2"
 	"golang.org/x/sync/semaphore"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/leases"

pkg/transfer/transfer.go

@@ -22,7 +22,7 @@ import (
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images"
 )
 

pkg/unpack/unpacker.go

@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/diff"
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/images"