Skip to content

Commit d0aa3ea

Browse files
thaJeztahthaJeztah
committed
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 <[email protected]>
1 parent 8983957 commit d0aa3ea

44 files changed

Lines changed: 45 additions & 45 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/server/httputils/form_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/url"
77
"testing"
88

9-
"github.com/containerd/containerd/platforms"
9+
"github.com/containerd/platforms"
1010
"github.com/docker/docker/errdefs"
1111

1212
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎api/server/router/container/container_routes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strconv"
1111
"strings"
1212

13-
"github.com/containerd/containerd/platforms"
1413
"github.com/containerd/log"
14+
"github.com/containerd/platforms"
1515
"github.com/docker/docker/api/server/httpstatus"
1616
"github.com/docker/docker/api/server/httputils"
1717
"github.com/docker/docker/api/types"

‎api/server/router/image/image_routes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"time"
1212

13-
"github.com/containerd/containerd/platforms"
13+
"github.com/containerd/platforms"
1414
"github.com/distribution/reference"
1515
"github.com/docker/docker/api"
1616
"github.com/docker/docker/api/server/httputils"

‎builder/builder-next/adapters/containerimage/pull.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import (
1818
"github.com/containerd/containerd/gc"
1919
"github.com/containerd/containerd/images"
2020
"github.com/containerd/containerd/leases"
21-
"github.com/containerd/containerd/platforms"
2221
cdreference "github.com/containerd/containerd/reference"
2322
ctdreference "github.com/containerd/containerd/reference"
2423
"github.com/containerd/containerd/remotes"
2524
"github.com/containerd/containerd/remotes/docker"
2625
"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.
2726
cerrdefs "github.com/containerd/errdefs"
2827
"github.com/containerd/log"
28+
"github.com/containerd/platforms"
2929
distreference "github.com/distribution/reference"
3030
dimages "github.com/docker/docker/daemon/images"
3131
"github.com/docker/docker/distribution/metadata"

‎builder/builder-next/builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"sync"
1111
"time"
1212

13-
"github.com/containerd/containerd/platforms"
1413
"github.com/containerd/containerd/remotes/docker"
14+
"github.com/containerd/platforms"
1515
"github.com/docker/docker/api/types"
1616
"github.com/docker/docker/api/types/backend"
1717
"github.com/docker/docker/api/types/container"

‎builder/builder-next/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
ctd "github.com/containerd/containerd"
1212
"github.com/containerd/containerd/content/local"
1313
ctdmetadata "github.com/containerd/containerd/metadata"
14-
"github.com/containerd/containerd/platforms"
1514
"github.com/containerd/containerd/snapshots"
1615
"github.com/containerd/log"
16+
"github.com/containerd/platforms"
1717
"github.com/docker/docker/api/types"
1818
"github.com/docker/docker/api/types/filters"
1919
"github.com/docker/docker/builder/builder-next/adapters/containerimage"

‎builder/builder-next/exporter/mobyexporter/writer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"encoding/json"
66
"time"
77

8-
"github.com/containerd/containerd/platforms"
98
"github.com/containerd/log"
9+
"github.com/containerd/platforms"
1010
"github.com/moby/buildkit/cache"
1111
"github.com/moby/buildkit/exporter/containerimage/exptypes"
1212
"github.com/moby/buildkit/util/progress"

‎builder/builder-next/worker/worker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/containerd/containerd/content"
1111
"github.com/containerd/containerd/images"
12-
"github.com/containerd/containerd/platforms"
1312
"github.com/containerd/containerd/rootfs"
1413
"github.com/containerd/log"
14+
"github.com/containerd/platforms"
1515
imageadapter "github.com/docker/docker/builder/builder-next/adapters/containerimage"
1616
mobyexporter "github.com/docker/docker/builder/builder-next/exporter"
1717
distmetadata "github.com/docker/docker/distribution/metadata"

‎builder/dockerfile/builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"sort"
99
"strings"
1010

11-
"github.com/containerd/containerd/platforms"
1211
"github.com/containerd/log"
12+
"github.com/containerd/platforms"
1313
"github.com/docker/docker/api/types"
1414
"github.com/docker/docker/api/types/backend"
1515
"github.com/docker/docker/api/types/container"

‎builder/dockerfile/dispatchers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"sort"
1616
"strings"
1717

18-
"github.com/containerd/containerd/platforms"
18+
"github.com/containerd/platforms"
1919
"github.com/docker/docker/api"
2020
"github.com/docker/docker/api/types/strslice"
2121
"github.com/docker/docker/builder"

0 commit comments

Comments
 (0)