Skip to content

Commit 88c0c72

Browse files
author
Kazuyoshi Kato
committed
Consolidate gogo/protobuf dependencies under our own protobuf package
This would make gogo/protobuf migration easier. Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent 184883b commit 88c0c72

69 files changed

Lines changed: 133 additions & 77 deletions

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
@@ -53,14 +53,14 @@ import (
5353
"github.com/containerd/containerd/pkg/dialer"
5454
"github.com/containerd/containerd/platforms"
5555
"github.com/containerd/containerd/plugin"
56+
ptypes "github.com/containerd/containerd/protobuf/types"
5657
"github.com/containerd/containerd/remotes"
5758
"github.com/containerd/containerd/remotes/docker"
5859
"github.com/containerd/containerd/sandbox"
5960
"github.com/containerd/containerd/services/introspection"
6061
"github.com/containerd/containerd/snapshots"
6162
snproxy "github.com/containerd/containerd/snapshots/proxy"
6263
"github.com/containerd/typeurl"
63-
ptypes "github.com/gogo/protobuf/types"
6464
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
6565
"github.com/opencontainers/runtime-spec/specs-go"
6666
"golang.org/x/sync/semaphore"

‎cmd/containerd-shim/main_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ import (
3939
"github.com/containerd/containerd/namespaces"
4040
"github.com/containerd/containerd/pkg/process"
4141
"github.com/containerd/containerd/protobuf"
42+
ptypes "github.com/containerd/containerd/protobuf/types"
4243
shimlog "github.com/containerd/containerd/runtime/v1"
4344
"github.com/containerd/containerd/runtime/v1/shim"
4445
shimapi "github.com/containerd/containerd/runtime/v1/shim/v1"
4546
"github.com/containerd/containerd/sys/reaper"
4647
"github.com/containerd/containerd/version"
4748
"github.com/containerd/ttrpc"
48-
ptypes "github.com/gogo/protobuf/types"
4949
"github.com/sirupsen/logrus"
5050
exec "golang.org/x/sys/execabs"
5151
"golang.org/x/sys/unix"

‎cmd/containerd/command/publish.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/containerd/containerd/errdefs"
2929
"github.com/containerd/containerd/namespaces"
3030
"github.com/containerd/containerd/pkg/dialer"
31-
"github.com/gogo/protobuf/types"
31+
"github.com/containerd/containerd/protobuf/types"
3232
"github.com/urfave/cli"
3333
"google.golang.org/grpc"
3434
"google.golang.org/grpc/backoff"

‎cmd/ctr/commands/shim/shim.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"github.com/containerd/console"
3232
"github.com/containerd/containerd/cmd/ctr/commands"
3333
"github.com/containerd/containerd/namespaces"
34+
ptypes "github.com/containerd/containerd/protobuf/types"
3435
"github.com/containerd/containerd/runtime/v2/shim"
3536
"github.com/containerd/containerd/runtime/v2/task"
3637
"github.com/containerd/ttrpc"
3738
"github.com/containerd/typeurl"
38-
ptypes "github.com/gogo/protobuf/types"
3939
"github.com/opencontainers/runtime-spec/specs-go"
4040
"github.com/sirupsen/logrus"
4141
"github.com/urfave/cli"

‎container_restore_opts.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/containerd/containerd/containers"
2525
"github.com/containerd/containerd/content"
2626
"github.com/containerd/containerd/images"
27-
"github.com/gogo/protobuf/proto"
28-
ptypes "github.com/gogo/protobuf/types"
27+
"github.com/containerd/containerd/protobuf/proto"
28+
ptypes "github.com/containerd/containerd/protobuf/types"
2929
"github.com/opencontainers/image-spec/identity"
3030
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
3131
)

‎containerstore.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/containerd/containerd/containers"
2626
"github.com/containerd/containerd/errdefs"
2727
"github.com/containerd/containerd/protobuf"
28+
ptypes "github.com/containerd/containerd/protobuf/types"
2829
"github.com/containerd/typeurl"
29-
ptypes "github.com/gogo/protobuf/types"
3030
"google.golang.org/grpc/codes"
3131
"google.golang.org/grpc/status"
3232
)

‎content/proxy/content_store.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/containerd/containerd/content"
2525
"github.com/containerd/containerd/errdefs"
2626
"github.com/containerd/containerd/protobuf"
27-
protobuftypes "github.com/gogo/protobuf/types"
27+
protobuftypes "github.com/containerd/containerd/protobuf/types"
2828
digest "github.com/opencontainers/go-digest"
2929
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3030
)

‎contrib/snapshotservice/service.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/errdefs"
2525
"github.com/containerd/containerd/mount"
2626
"github.com/containerd/containerd/protobuf"
27+
ptypes "github.com/containerd/containerd/protobuf/types"
2728
"github.com/containerd/containerd/snapshots"
28-
ptypes "github.com/gogo/protobuf/types"
2929
)
3030

3131
var empty = &ptypes.Empty{}

‎diff/diff.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"io"
2222

2323
"github.com/containerd/containerd/mount"
24-
"github.com/gogo/protobuf/types"
24+
"github.com/containerd/containerd/protobuf/types"
2525
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2626
)
2727

‎diff/stream.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/containerd/containerd/archive/compression"
2626
"github.com/containerd/containerd/images"
27-
"github.com/gogo/protobuf/types"
27+
"github.com/containerd/containerd/protobuf/types"
2828
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2929
)
3030

0 commit comments

Comments
 (0)