Skip to content

Commit 6ff3e09

Browse files
thaJeztahthaJeztah
committed
migrate platforms package to github.com/containerd/platforms
This updates the platforms package to be an alias for the new platforms module. This helps transitioning consumers to the new module, and makes sure that containerd v2 and v1 use the same definitions. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 3eb3e53 commit 6ff3e09

92 files changed

Lines changed: 640 additions & 1473 deletions

File tree

Some content is hidden

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

‎client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import (
5050
leasesproxy "github.com/containerd/containerd/leases/proxy"
5151
"github.com/containerd/containerd/namespaces"
5252
"github.com/containerd/containerd/pkg/dialer"
53-
"github.com/containerd/containerd/platforms"
5453
"github.com/containerd/containerd/plugin"
5554
ptypes "github.com/containerd/containerd/protobuf/types"
5655
"github.com/containerd/containerd/remotes"
@@ -61,6 +60,7 @@ import (
6160
"github.com/containerd/containerd/snapshots"
6261
snproxy "github.com/containerd/containerd/snapshots/proxy"
6362
"github.com/containerd/errdefs"
63+
"github.com/containerd/platforms"
6464
"github.com/containerd/typeurl/v2"
6565
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
6666
"github.com/opencontainers/runtime-spec/specs-go"

‎client_opts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"time"
2121

2222
"github.com/containerd/containerd/images"
23-
"github.com/containerd/containerd/platforms"
2423
"github.com/containerd/containerd/remotes"
2524
"github.com/containerd/containerd/snapshots"
25+
"github.com/containerd/platforms"
2626
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2727

2828
"google.golang.org/grpc"

‎cmd/ctr/commands/content/fetch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ import (
3131
"github.com/containerd/containerd/content"
3232
"github.com/containerd/containerd/images"
3333
"github.com/containerd/containerd/pkg/progress"
34-
"github.com/containerd/containerd/platforms"
3534
"github.com/containerd/containerd/remotes"
3635
"github.com/containerd/errdefs"
3736
"github.com/containerd/log"
37+
"github.com/containerd/platforms"
3838
"github.com/opencontainers/go-digest"
3939
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4040
"github.com/urfave/cli"

‎cmd/ctr/commands/images/convert.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/containerd/containerd/cmd/ctr/commands"
2424
"github.com/containerd/containerd/images/converter"
2525
"github.com/containerd/containerd/images/converter/uncompress"
26-
"github.com/containerd/containerd/platforms"
26+
"github.com/containerd/platforms"
2727
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2828
"github.com/urfave/cli"
2929
)

‎cmd/ctr/commands/images/export.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/containerd/containerd/pkg/transfer"
3131
tarchive "github.com/containerd/containerd/pkg/transfer/archive"
3232
"github.com/containerd/containerd/pkg/transfer/image"
33-
"github.com/containerd/containerd/platforms"
33+
"github.com/containerd/platforms"
3434
)
3535

3636
var exportCommand = cli.Command{

‎cmd/ctr/commands/images/images.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/containerd/containerd/cmd/ctr/commands"
2828
"github.com/containerd/containerd/images"
2929
"github.com/containerd/containerd/pkg/progress"
30-
"github.com/containerd/containerd/platforms"
3130
"github.com/containerd/errdefs"
3231
"github.com/containerd/log"
32+
"github.com/containerd/platforms"
3333
"github.com/urfave/cli"
3434
)
3535

‎cmd/ctr/commands/images/import.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"github.com/containerd/containerd/pkg/transfer"
3232
tarchive "github.com/containerd/containerd/pkg/transfer/archive"
3333
"github.com/containerd/containerd/pkg/transfer/image"
34-
"github.com/containerd/containerd/platforms"
3534
"github.com/containerd/log"
35+
"github.com/containerd/platforms"
3636
)
3737

3838
var importCommand = cli.Command{

‎cmd/ctr/commands/images/mount.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/containerd/containerd/cmd/ctr/commands"
2525
"github.com/containerd/containerd/leases"
2626
"github.com/containerd/containerd/mount"
27-
"github.com/containerd/containerd/platforms"
2827
"github.com/containerd/errdefs"
28+
"github.com/containerd/platforms"
2929
"github.com/opencontainers/image-spec/identity"
3030
"github.com/urfave/cli"
3131
)

‎cmd/ctr/commands/images/pull.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"github.com/containerd/containerd/pkg/transfer"
3333
"github.com/containerd/containerd/pkg/transfer/image"
3434
"github.com/containerd/containerd/pkg/transfer/registry"
35-
"github.com/containerd/containerd/platforms"
3635
"github.com/containerd/log"
36+
"github.com/containerd/platforms"
3737
"github.com/opencontainers/image-spec/identity"
3838
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3939
"github.com/urfave/cli"

‎cmd/ctr/commands/images/push.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434
"github.com/containerd/containerd/pkg/transfer"
3535
"github.com/containerd/containerd/pkg/transfer/image"
3636
"github.com/containerd/containerd/pkg/transfer/registry"
37-
"github.com/containerd/containerd/platforms"
3837
"github.com/containerd/containerd/remotes"
3938
"github.com/containerd/containerd/remotes/docker"
4039
"github.com/containerd/log"
40+
"github.com/containerd/platforms"
4141
digest "github.com/opencontainers/go-digest"
4242
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4343
"github.com/urfave/cli"

0 commit comments

Comments
 (0)