github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6826 from kzys/ptypes

Browse Source 
Consolidate gogo/protobuf dependencies under our own protobuf package
This commit is contained in:
Derek McGowan
2022-04-19 10:13:56 -07:00
committed by GitHub
parent 9503d7219e 88c0c7201e
commit 902212651b
69 changed files with 133 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/client/client_ttrpc_test.go
View File

@@ -25,8 +25,8 @@ import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/ttrpcutil"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/types"
"github.com/containerd/ttrpc"
"github.com/gogo/protobuf/types"
"github.com/stretchr/testify/assert"
)

2
integration/client/container_test.go
View File

@@ -40,11 +40,11 @@ import (
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugin"
gogotypes "github.com/containerd/containerd/protobuf/types"
_ "github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/go-runc"
"github.com/containerd/typeurl"
gogotypes "github.com/gogo/protobuf/types"
specs "github.com/opencontainers/runtime-spec/specs-go"
exec "golang.org/x/sys/execabs"
)

2
integration/client/go.mod
View File

@@ -10,7 +10,7 @@ require (
github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.1.0
github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259
github.com/gogo/protobuf v1.3.2
github.com/gogo/protobuf v1.3.2 // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417