1. docker
  2. Commit d0aa3eaccfa845afba93cd3ca2f01c41938a39fa
Browse code

Migrate to github.com/containerd/platforms module

Switch to use github.com/containerd/platforms module, because containerd's
platforms package has moved to a separate module. This allows updating the
platforms parsing independent of the containerd module itself.

The package in containerd is deprecated, but kept as an alias to provide
compatibility between codebases.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2024/01/21 06:31:50
Showing 44 changed files
api/server/httputils/form_test.go
History View file @ d0aa3ea
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"net/url"
7 7 
 	"testing"
8 8
9 
-	"github.com/containerd/containerd/platforms"
9 
+	"github.com/containerd/platforms"
10 10 
 	"github.com/docker/docker/errdefs"
11 11
12 12 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
api/server/router/container/container_routes.go
History View file @ d0aa3ea
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"strconv"
11 11 
 	"strings"
12 12
13 
-	"github.com/containerd/containerd/platforms"
14 13 
 	"github.com/containerd/log"
14 
+	"github.com/containerd/platforms"
15 15 
 	"github.com/docker/docker/api/server/httpstatus"
16 16 
 	"github.com/docker/docker/api/server/httputils"
17 17 
 	"github.com/docker/docker/api/types"
api/server/router/image/image_routes.go
History View file @ d0aa3ea
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"strings"
11 11 
 	"time"
12 12
13 
-	"github.com/containerd/containerd/platforms"
13 
+	"github.com/containerd/platforms"
14 14 
 	"github.com/distribution/reference"
15 15 
 	"github.com/docker/docker/api"
16 16 
 	"github.com/docker/docker/api/server/httputils"
builder/builder-next/adapters/containerimage/pull.go
History View file @ d0aa3ea
... ... 
@@ -18,7 +18,6 @@ import (
18 18 
 	"github.com/containerd/containerd/gc"
19 19 
 	"github.com/containerd/containerd/images"
20 20 
 	"github.com/containerd/containerd/leases"
21 
-	"github.com/containerd/containerd/platforms"
22 21 
 	cdreference "github.com/containerd/containerd/reference"
23 22 
 	ctdreference "github.com/containerd/containerd/reference"
24 23 
 	"github.com/containerd/containerd/remotes"
... ... 
@@ -26,6 +25,7 @@ import (
26 26 
 	"github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019: "github.com/containerd/containerd/remotes/docker/schema1" is deprecated: use images formatted in Docker Image Manifest v2, Schema 2, or OCI Image Spec v1.
27 27 
 	cerrdefs "github.com/containerd/errdefs"
28 28 
 	"github.com/containerd/log"
29 
+	"github.com/containerd/platforms"
29 30 
 	distreference "github.com/distribution/reference"
30 31 
 	dimages "github.com/docker/docker/daemon/images"
31 32 
 	"github.com/docker/docker/distribution/metadata"
builder/builder-next/builder.go
History View file @ d0aa3ea
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"sync"
11 11 
 	"time"
12 12
13 
-	"github.com/containerd/containerd/platforms"
14 13 
 	"github.com/containerd/containerd/remotes/docker"
14 
+	"github.com/containerd/platforms"
15 15 
 	"github.com/docker/docker/api/types"
16 16 
 	"github.com/docker/docker/api/types/backend"
17 17 
 	"github.com/docker/docker/api/types/container"
builder/builder-next/controller.go
History View file @ d0aa3ea
... ... 
@@ -11,9 +11,9 @@ import (
11 11 
 	ctd "github.com/containerd/containerd"
12 12 
 	"github.com/containerd/containerd/content/local"
13 13 
 	ctdmetadata "github.com/containerd/containerd/metadata"
14 
-	"github.com/containerd/containerd/platforms"
15 14 
 	"github.com/containerd/containerd/snapshots"
16 15 
 	"github.com/containerd/log"
16 
+	"github.com/containerd/platforms"
17 17 
 	"github.com/docker/docker/api/types"
18 18 
 	"github.com/docker/docker/api/types/filters"
19 19 
 	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
builder/builder-next/exporter/mobyexporter/writer.go
History View file @ d0aa3ea
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"encoding/json"
6 6 
 	"time"
7 7
8 
-	"github.com/containerd/containerd/platforms"
9 8 
 	"github.com/containerd/log"
9 
+	"github.com/containerd/platforms"
10 10 
 	"github.com/moby/buildkit/cache"
11 11 
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"
12 12 
 	"github.com/moby/buildkit/util/progress"
builder/builder-next/worker/worker.go
History View file @ d0aa3ea
... ... 
@@ -9,9 +9,9 @@ import (
9 9
10 10 
 	"github.com/containerd/containerd/content"
11 11 
 	"github.com/containerd/containerd/images"
12 
-	"github.com/containerd/containerd/platforms"
13 12 
 	"github.com/containerd/containerd/rootfs"
14 13 
 	"github.com/containerd/log"
14 
+	"github.com/containerd/platforms"
15 15 
 	imageadapter "github.com/docker/docker/builder/builder-next/adapters/containerimage"
16 16 
 	mobyexporter "github.com/docker/docker/builder/builder-next/exporter"
17 17 
 	distmetadata "github.com/docker/docker/distribution/metadata"
builder/dockerfile/builder.go
History View file @ d0aa3ea
... ... 
@@ -8,8 +8,8 @@ import (
8 8 
 	"sort"
9 9 
 	"strings"
10 10
11 
-	"github.com/containerd/containerd/platforms"
12 11 
 	"github.com/containerd/log"
12 
+	"github.com/containerd/platforms"
13 13 
 	"github.com/docker/docker/api/types"
14 14 
 	"github.com/docker/docker/api/types/backend"
15 15 
 	"github.com/docker/docker/api/types/container"
builder/dockerfile/dispatchers.go
History View file @ d0aa3ea
... ... 
@@ -15,7 +15,7 @@ import (
15 15 
 	"sort"
16 16 
 	"strings"
17 17
18 
-	"github.com/containerd/containerd/platforms"
18 
+	"github.com/containerd/platforms"
19 19 
 	"github.com/docker/docker/api"
20 20 
 	"github.com/docker/docker/api/types/strslice"
21 21 
 	"github.com/docker/docker/builder"
builder/dockerfile/imagecontext.go
History View file @ d0aa3ea
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"context"
5 5 
 	"runtime"
6 6
7 
-	"github.com/containerd/containerd/platforms"
8 7 
 	"github.com/containerd/log"
8 
+	"github.com/containerd/platforms"
9 9 
 	"github.com/docker/docker/api/types/backend"
10 10 
 	"github.com/docker/docker/builder"
11 11 
 	dockerimage "github.com/docker/docker/image"
builder/dockerfile/imagecontext_test.go
History View file @ d0aa3ea
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"runtime"
7 7 
 	"testing"
8 8
9 
-	"github.com/containerd/containerd/platforms"
9 
+	"github.com/containerd/platforms"
10 10 
 	"github.com/docker/docker/builder"
11 11 
 	"github.com/docker/docker/image"
12 12 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
builder/dockerfile/internals.go
History View file @ d0aa3ea
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"fmt"
11 11 
 	"strings"
12 12
13 
-	"github.com/containerd/containerd/platforms"
14 13 
 	"github.com/containerd/log"
14 
+	"github.com/containerd/platforms"
15 15 
 	"github.com/docker/docker/api/types"
16 16 
 	"github.com/docker/docker/api/types/backend"
17 17 
 	"github.com/docker/docker/api/types/container"
builder/dockerfile/internals_windows.go
History View file @ d0aa3ea
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"path/filepath"
8 8 
 	"strings"
9 9
10 
-	"github.com/containerd/containerd/platforms"
10 
+	"github.com/containerd/platforms"
11 11 
 	"github.com/docker/docker/api/types/container"
12 12 
 	"github.com/docker/docker/api/types/mount"
13 13 
 	"github.com/docker/docker/errdefs"
daemon/containerd/image.go
History View file @ d0aa3ea
... ... 
@@ -11,9 +11,9 @@ import (
11 11 
 	"time"
12 12
13 13 
 	containerdimages "github.com/containerd/containerd/images"
14 
-	"github.com/containerd/containerd/platforms"
15 14 
 	cerrdefs "github.com/containerd/errdefs"
16 15 
 	"github.com/containerd/log"
16 
+	"github.com/containerd/platforms"
17 17 
 	"github.com/distribution/reference"
18 18 
 	"github.com/docker/docker/api/types/backend"
19 19 
 	"github.com/docker/docker/daemon/images"
daemon/containerd/image_builder.go
History View file @ d0aa3ea
... ... 
@@ -16,10 +16,10 @@ import (
16 16 
 	containerdimages "github.com/containerd/containerd/images"
17 17 
 	"github.com/containerd/containerd/leases"
18 18 
 	"github.com/containerd/containerd/mount"
19 
-	"github.com/containerd/containerd/platforms"
20 19 
 	"github.com/containerd/containerd/rootfs"
21 20 
 	cerrdefs "github.com/containerd/errdefs"
22 21 
 	"github.com/containerd/log"
22 
+	"github.com/containerd/platforms"
23 23 
 	"github.com/distribution/reference"
24 24 
 	"github.com/docker/docker/api/types/backend"
25 25 
 	"github.com/docker/docker/api/types/container"
daemon/containerd/image_exporter.go
History View file @ d0aa3ea
... ... 
@@ -11,9 +11,9 @@ import (
11 11 
 	containerdimages "github.com/containerd/containerd/images"
12 12 
 	"github.com/containerd/containerd/images/archive"
13 13 
 	"github.com/containerd/containerd/leases"
14 
-	"github.com/containerd/containerd/platforms"
15 14 
 	cerrdefs "github.com/containerd/errdefs"
16 15 
 	"github.com/containerd/log"
16 
+	"github.com/containerd/platforms"
17 17 
 	"github.com/distribution/reference"
18 18 
 	"github.com/docker/docker/api/types/events"
19 19 
 	"github.com/docker/docker/container"
daemon/containerd/image_history.go
History View file @ d0aa3ea
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"time"
6 6
7 7 
 	containerdimages "github.com/containerd/containerd/images"
8 
-	"github.com/containerd/containerd/platforms"
9 8 
 	"github.com/containerd/log"
9 
+	"github.com/containerd/platforms"
10 10 
 	"github.com/distribution/reference"
11 11 
 	imagetype "github.com/docker/docker/api/types/image"
12 12 
 	dimages "github.com/docker/docker/daemon/images"
daemon/containerd/image_import.go
History View file @ d0aa3ea
... ... 
@@ -11,9 +11,9 @@ import (
11 11
12 12 
 	"github.com/containerd/containerd/content"
13 13 
 	"github.com/containerd/containerd/images"
14 
-	"github.com/containerd/containerd/platforms"
15 14 
 	cerrdefs "github.com/containerd/errdefs"
16 15 
 	"github.com/containerd/log"
16 
+	"github.com/containerd/platforms"
17 17 
 	"github.com/distribution/reference"
18 18 
 	"github.com/docker/docker/api/types/container"
19 19 
 	"github.com/docker/docker/api/types/events"
daemon/containerd/image_list.go
History View file @ d0aa3ea
... ... 
@@ -12,10 +12,10 @@ import (
12 12 
 	"github.com/containerd/containerd/content"
13 13 
 	"github.com/containerd/containerd/images"
14 14 
 	"github.com/containerd/containerd/labels"
15 
-	"github.com/containerd/containerd/platforms"
16 15 
 	"github.com/containerd/containerd/snapshots"
17 16 
 	cerrdefs "github.com/containerd/errdefs"
18 17 
 	"github.com/containerd/log"
18 
+	"github.com/containerd/platforms"
19 19 
 	"github.com/distribution/reference"
20 20 
 	"github.com/docker/docker/api/types/backend"
21 21 
 	"github.com/docker/docker/api/types/filters"
daemon/containerd/image_list_test.go
History View file @ d0aa3ea
... ... 
@@ -17,10 +17,10 @@ import (
17 17 
 	"github.com/containerd/containerd/images"
18 18 
 	"github.com/containerd/containerd/metadata"
19 19 
 	"github.com/containerd/containerd/namespaces"
20 
-	"github.com/containerd/containerd/platforms"
21 20 
 	"github.com/containerd/containerd/snapshots"
22 21 
 	cerrdefs "github.com/containerd/errdefs"
23 22 
 	"github.com/containerd/log/logtest"
23 
+	"github.com/containerd/platforms"
24 24 
 	imagetypes "github.com/docker/docker/api/types/image"
25 25 
 	daemonevents "github.com/docker/docker/daemon/events"
26 26 
 	"github.com/docker/docker/internal/testutils/specialimage"
daemon/containerd/image_manifest.go
History View file @ d0aa3ea
... ... 
@@ -8,8 +8,8 @@ import (
8 8 
 	"github.com/containerd/containerd/content"
9 9 
 	"github.com/containerd/containerd/images"
10 10 
 	containerdimages "github.com/containerd/containerd/images"
11 
-	"github.com/containerd/containerd/platforms"
12 11 
 	cerrdefs "github.com/containerd/errdefs"
12 
+	"github.com/containerd/platforms"
13 13 
 	"github.com/docker/docker/errdefs"
14 14 
 	"github.com/moby/buildkit/util/attestation"
15 15 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
daemon/containerd/image_pull.go
History View file @ d0aa3ea
... ... 
@@ -11,10 +11,10 @@ import (
11 11 
 	"github.com/containerd/containerd"
12 12 
 	"github.com/containerd/containerd/images"
13 13 
 	"github.com/containerd/containerd/pkg/snapshotters"
14 
-	"github.com/containerd/containerd/platforms"
15 14 
 	"github.com/containerd/containerd/remotes/docker"
16 15 
 	cerrdefs "github.com/containerd/errdefs"
17 16 
 	"github.com/containerd/log"
17 
+	"github.com/containerd/platforms"
18 18 
 	"github.com/distribution/reference"
19 19 
 	"github.com/docker/docker/api/types/events"
20 20 
 	registrytypes "github.com/docker/docker/api/types/registry"
daemon/containerd/image_push.go
History View file @ d0aa3ea
... ... 
@@ -12,11 +12,11 @@ import (
12 12 
 	"github.com/containerd/containerd/images"
13 13 
 	containerdimages "github.com/containerd/containerd/images"
14 14 
 	containerdlabels "github.com/containerd/containerd/labels"
15 
-	"github.com/containerd/containerd/platforms"
16 15 
 	"github.com/containerd/containerd/remotes"
17 16 
 	"github.com/containerd/containerd/remotes/docker"
18 17 
 	cerrdefs "github.com/containerd/errdefs"
19 18 
 	"github.com/containerd/log"
19 
+	"github.com/containerd/platforms"
20 20 
 	"github.com/distribution/reference"
21 21 
 	"github.com/docker/docker/api/types/auxprogress"
22 22 
 	"github.com/docker/docker/api/types/events"
daemon/containerd/image_push_test.go
History View file @ d0aa3ea
... ... 
@@ -11,7 +11,7 @@ import (
11 11
12 12 
 	containerdimages "github.com/containerd/containerd/images"
13 13 
 	"github.com/containerd/containerd/namespaces"
14 
-	"github.com/containerd/containerd/platforms"
14 
+	"github.com/containerd/platforms"
15 15 
 	"github.com/docker/docker/errdefs"
16 16 
 	"github.com/docker/docker/internal/testutils/specialimage"
17 17 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
daemon/containerd/image_snapshot.go
History View file @ d0aa3ea
... ... 
@@ -8,9 +8,9 @@ import (
8 8 
 	containerdimages "github.com/containerd/containerd/images"
9 9 
 	"github.com/containerd/containerd/leases"
10 10 
 	"github.com/containerd/containerd/mount"
11 
-	"github.com/containerd/containerd/platforms"
12 11 
 	"github.com/containerd/containerd/snapshots"
13 12 
 	cerrdefs "github.com/containerd/errdefs"
13 
+	"github.com/containerd/platforms"
14 14 
 	"github.com/docker/docker/errdefs"
15 15 
 	"github.com/opencontainers/image-spec/identity"
16 16 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
daemon/containerd/platform_matchers.go
History View file @ d0aa3ea
... ... 
@@ -1,7 +1,7 @@
1 1 
 package containerd
2 2
3 3 
 import (
4 
-	"github.com/containerd/containerd/platforms"
4 
+	"github.com/containerd/platforms"
5 5 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
6 6 
 )
7 7
daemon/containerd/service.go
History View file @ d0aa3ea
... ... 
@@ -8,12 +8,12 @@ import (
8 8 
 	"github.com/containerd/containerd"
9 9 
 	"github.com/containerd/containerd/content"
10 10 
 	"github.com/containerd/containerd/images"
11 
-	"github.com/containerd/containerd/platforms"
12 11 
 	"github.com/containerd/containerd/plugin"
13 12 
 	"github.com/containerd/containerd/remotes/docker"
14 13 
 	"github.com/containerd/containerd/snapshots"
15 14 
 	cerrdefs "github.com/containerd/errdefs"
16 15 
 	"github.com/containerd/log"
16 
+	"github.com/containerd/platforms"
17 17 
 	"github.com/distribution/reference"
18 18 
 	"github.com/docker/docker/container"
19 19 
 	daemonevents "github.com/docker/docker/daemon/events"
daemon/create.go
History View file @ d0aa3ea
... ... 
@@ -7,8 +7,8 @@ import (
7 7 
 	"strings"
8 8 
 	"time"
9 9
10 
-	"github.com/containerd/containerd/platforms"
11 10 
 	"github.com/containerd/log"
11 
+	"github.com/containerd/platforms"
12 12 
 	"github.com/docker/docker/api/types/backend"
13 13 
 	containertypes "github.com/docker/docker/api/types/container"
14 14 
 	"github.com/docker/docker/api/types/events"
daemon/images/image.go
History View file @ d0aa3ea
... ... 
@@ -9,9 +9,9 @@ import (
9 9 
 	"github.com/containerd/containerd/content"
10 10 
 	"github.com/containerd/containerd/images"
11 11 
 	"github.com/containerd/containerd/leases"
12 
-	"github.com/containerd/containerd/platforms"
13 12 
 	cerrdefs "github.com/containerd/errdefs"
14 13 
 	"github.com/containerd/log"
14 
+	"github.com/containerd/platforms"
15 15 
 	"github.com/distribution/reference"
16 16 
 	"github.com/docker/docker/api/types/backend"
17 17 
 	"github.com/docker/docker/errdefs"
daemon/images/image_builder.go
History View file @ d0aa3ea
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"io"
7 7 
 	"runtime"
8 8
9 
-	"github.com/containerd/containerd/platforms"
10 9 
 	"github.com/containerd/log"
10 
+	"github.com/containerd/platforms"
11 11 
 	"github.com/distribution/reference"
12 12 
 	"github.com/docker/docker/api/types/backend"
13 13 
 	"github.com/docker/docker/api/types/registry"
daemon/images/image_import.go
History View file @ d0aa3ea
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"io"
7 7 
 	"time"
8 8
9 
-	"github.com/containerd/containerd/platforms"
9 
+	"github.com/containerd/platforms"
10 10 
 	"github.com/distribution/reference"
11 11 
 	"github.com/docker/docker/api/types/container"
12 12 
 	"github.com/docker/docker/api/types/events"
distribution/pull_v2.go
History View file @ d0aa3ea
... ... 
@@ -10,8 +10,8 @@ import (
10 10 
 	"strings"
11 11 
 	"time"
12 12
13 
-	"github.com/containerd/containerd/platforms"
14 13 
 	"github.com/containerd/log"
14 
+	"github.com/containerd/platforms"
15 15 
 	"github.com/distribution/reference"
16 16 
 	"github.com/docker/distribution"
17 17 
 	"github.com/docker/distribution/manifest/manifestlist"
distribution/pull_v2_unix.go
History View file @ d0aa3ea
... ... 
@@ -6,8 +6,8 @@ import (
6 6 
 	"context"
7 7 
 	"sort"
8 8
9 
-	"github.com/containerd/containerd/platforms"
10 9 
 	"github.com/containerd/log"
10 
+	"github.com/containerd/platforms"
11 11 
 	"github.com/docker/distribution"
12 12 
 	"github.com/docker/distribution/manifest/manifestlist"
13 13 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
distribution/pull_v2_windows.go
History View file @ d0aa3ea
... ... 
@@ -12,8 +12,8 @@ import (
12 12 
 	"strings"
13 13
14 14 
 	"github.com/Microsoft/hcsshim/osversion"
15 
-	"github.com/containerd/containerd/platforms"
16 15 
 	"github.com/containerd/log"
16 
+	"github.com/containerd/platforms"
17 17 
 	"github.com/docker/distribution"
18 18 
 	"github.com/docker/distribution/manifest/manifestlist"
19 19 
 	"github.com/docker/distribution/manifest/schema2"
image/cache/compare.go
History View file @ d0aa3ea
... ... 
@@ -3,7 +3,7 @@ package cache // import "github.com/docker/docker/image/cache"
3 3 
 import (
4 4 
 	"strings"
5 5
6 
-	"github.com/containerd/containerd/platforms"
6 
+	"github.com/containerd/platforms"
7 7 
 	"github.com/docker/docker/api/types/container"
8 8 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
9 9 
 )
integration/image/import_test.go
History View file @ d0aa3ea
... ... 
@@ -147,11 +147,11 @@ func TestImportWithCustomPlatformReject(t *testing.T) {
147 147 
 	}{
148 148 
 		{
149 149 
 			platform:    "       ",
150 
-			expectedErr: "is an invalid component",
150 
+			expectedErr: "is an invalid OS component",
151 151 
 		},
152 152 
 		{
153 153 
 			platform:    "/",
154 
-			expectedErr: "is an invalid component",
154 
+			expectedErr: "is an invalid OS component",
155 155 
 		},
156 156 
 		{
157 157 
 			platform:    "macos",
integration/image/pull_test.go
History View file @ d0aa3ea
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/containerd/containerd/content"
15 15 
 	"github.com/containerd/containerd/content/local"
16 16 
 	"github.com/containerd/containerd/images"
17 
-	"github.com/containerd/containerd/platforms"
17 
+	"github.com/containerd/platforms"
18 18 
 	"github.com/docker/docker/api/types/image"
19 19 
 	"github.com/docker/docker/errdefs"
20 20 
 	"github.com/docker/docker/testutil/registry"
internal/testutils/specialimage/configtarget.go
History View file @ d0aa3ea
... ... 
@@ -1,7 +1,7 @@
1 1 
 package specialimage
2 2
3 3 
 import (
4 
-	"github.com/containerd/containerd/platforms"
4 
+	"github.com/containerd/platforms"
5 5 
 	"github.com/distribution/reference"
6 6 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
7 7 
 )
internal/testutils/specialimage/multilayer.go
History View file @ d0aa3ea
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"os"
8 8 
 	"path/filepath"
9 9
10 
-	"github.com/containerd/containerd/platforms"
10 
+	"github.com/containerd/platforms"
11 11 
 	"github.com/distribution/reference"
12 12 
 	"github.com/docker/docker/pkg/archive"
13 13 
 	"github.com/google/uuid"
internal/testutils/specialimage/multiplatform.go
History View file @ d0aa3ea
... ... 
@@ -1,7 +1,7 @@
1 1 
 package specialimage
2 2
3 3 
 import (
4 
-	"github.com/containerd/containerd/platforms"
4 
+	"github.com/containerd/platforms"
5 5 
 	"github.com/distribution/reference"
6 6 
 	"github.com/opencontainers/image-spec/specs-go"
7 7 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
internal/testutils/specialimage/twoplatform.go
History View file @ d0aa3ea
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"os"
5 5 
 	"path/filepath"
6 6
7 
-	"github.com/containerd/containerd/platforms"
7 
+	"github.com/containerd/platforms"
8 8 
 	"github.com/distribution/reference"
9 9 
 	"github.com/opencontainers/go-digest"
10 10 
 	"github.com/opencontainers/image-spec/specs-go"
plugin/backend_linux.go
History View file @ d0aa3ea
... ... 
@@ -16,10 +16,10 @@ import (
16 16
17 17 
 	"github.com/containerd/containerd/content"
18 18 
 	"github.com/containerd/containerd/images"
19 
-	"github.com/containerd/containerd/platforms"
20 19 
 	"github.com/containerd/containerd/remotes"
21 20 
 	"github.com/containerd/containerd/remotes/docker"
22 21 
 	"github.com/containerd/log"
22 
+	"github.com/containerd/platforms"
23 23 
 	"github.com/distribution/reference"
24 24 
 	"github.com/docker/distribution/manifest/schema2"
25 25 
 	"github.com/docker/docker/api/types"
vendor.mod
History View file @ d0aa3ea
... ... 
@@ -31,6 +31,7 @@ require (
31 31 
 	github.com/containerd/errdefs v0.1.0
32 32 
 	github.com/containerd/fifo v1.1.0
33 33 
 	github.com/containerd/log v0.1.0
34 
+	github.com/containerd/platforms v0.2.1
34 35 
 	github.com/containerd/typeurl/v2 v2.1.1
35 36 
 	github.com/coreos/go-systemd/v22 v22.5.0
36 37 
 	github.com/cpuguy83/tar2go v0.3.1
... ... 
@@ -145,7 +146,6 @@ require (
145 145 
 	github.com/containerd/go-cni v1.1.9 // indirect
146 146 
 	github.com/containerd/go-runc v1.1.0 // indirect
147 147 
 	github.com/containerd/nydus-snapshotter v0.13.7 // indirect
148 
-	github.com/containerd/platforms v0.2.1 // indirect
149 148 
 	github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
150 149 
 	github.com/containerd/ttrpc v1.2.5 // indirect
151 150 
 	github.com/containernetworking/cni v1.1.2 // indirect