Move content to core/content

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

images/archive/exporter.go

@@ -26,7 +26,7 @@ import (
 	"sort"
 	"strings"
 
-	"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/labels"

images/archive/importer.go

@@ -28,7 +28,7 @@ import (
 	"path"
 
 	"github.com/containerd/containerd/v2/archive/compression"
-	"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/labels"

images/converter/converter.go

@@ -20,7 +20,7 @@ package converter
 import (
 	"context"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/platforms"

images/converter/default.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/platforms"
 	"github.com/containerd/log"

images/converter/uncompress/uncompress.go

@@ -22,7 +22,7 @@ import (
 	"io"
 
 	"github.com/containerd/containerd/v2/archive/compression"
-	"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/converter"

images/diffid.go

@@ -24,7 +24,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
 	"github.com/containerd/containerd/v2/archive/compression"
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/labels"
 	"github.com/containerd/log"
 )

images/handlers.go

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

images/image.go

@@ -23,7 +23,7 @@ import (
 	"sort"
 	"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/platforms"
 	"github.com/containerd/log"

images/imagetest/content.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/containerd/containerd/v2/content"
+	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/plugins/content/local"
 	"github.com/opencontainers/go-digest"

images/importexport.go

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

images/usage/calculator.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"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/platforms"