Skip to content

Commit 08150bf

Browse files
crosbymichaelcrosbymichael
committed
Update ttrpc for containerd repo
Signed-off-by: Michael Crosby <[email protected]>
1 parent ca20431 commit 08150bf

25 files changed

Lines changed: 231 additions & 71 deletions

File tree

‎cmd/containerd-shim/main_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ import (
3939
"github.com/containerd/containerd/runtime/linux/proc"
4040
"github.com/containerd/containerd/runtime/shim"
4141
shimapi "github.com/containerd/containerd/runtime/shim/v1"
42+
"github.com/containerd/ttrpc"
4243
"github.com/containerd/typeurl"
4344
ptypes "github.com/gogo/protobuf/types"
4445
"github.com/pkg/errors"
4546
"github.com/sirupsen/logrus"
46-
"github.com/stevvooe/ttrpc"
4747
"golang.org/x/sys/unix"
4848
)
4949

‎cmd/containerd-shim/shim_darwin.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/runtime/shim"
2626
runc "github.com/containerd/go-runc"
27-
"github.com/stevvooe/ttrpc"
27+
"github.com/containerd/ttrpc"
2828
)
2929

3030
// setupSignals creates a new signal handler for all signals and sets the shim as a

‎cmd/containerd-shim/shim_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/containerd/containerd/runtime/shim"
2424
runc "github.com/containerd/go-runc"
25+
"github.com/containerd/ttrpc"
2526
"github.com/opencontainers/runc/libcontainer/system"
26-
"github.com/stevvooe/ttrpc"
2727
"golang.org/x/sys/unix"
2828
)
2929

‎cmd/containerd-shim/shim_unix.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/runtime/shim"
2626
runc "github.com/containerd/go-runc"
27-
"github.com/stevvooe/ttrpc"
27+
"github.com/containerd/ttrpc"
2828
)
2929

3030
// setupSignals creates a new signal handler for all signals and sets the shim as a

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import (
2727
"github.com/containerd/console"
2828
"github.com/containerd/containerd/cmd/ctr/commands"
2929
shim "github.com/containerd/containerd/runtime/shim/v1"
30+
"github.com/containerd/ttrpc"
3031
"github.com/containerd/typeurl"
3132
ptypes "github.com/gogo/protobuf/types"
3233
"github.com/opencontainers/runtime-spec/specs-go"
3334
"github.com/pkg/errors"
3435
"github.com/sirupsen/logrus"
35-
"github.com/stevvooe/ttrpc"
3636
"github.com/urfave/cli"
3737
)
3838

‎cmd/protoc-gen-gogoctrd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package main
1818

1919
import (
2020
_ "github.com/containerd/containerd/protobuf/plugin/fieldpath"
21+
_ "github.com/containerd/ttrpc/plugin"
2122
"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
2223
"github.com/gogo/protobuf/vanity"
2324
"github.com/gogo/protobuf/vanity/command"
24-
_ "github.com/stevvooe/ttrpc/plugin"
2525
)
2626

2727
func main() {

‎runtime/linux/process.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/containerd/containerd/errdefs"
2727
"github.com/containerd/containerd/runtime"
2828
shim "github.com/containerd/containerd/runtime/shim/v1"
29+
"github.com/containerd/ttrpc"
2930
"github.com/pkg/errors"
30-
"github.com/stevvooe/ttrpc"
3131
)
3232

3333
// Process implements a linux process

‎runtime/linux/task.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import (
3232
"github.com/containerd/containerd/runtime/shim/client"
3333
shim "github.com/containerd/containerd/runtime/shim/v1"
3434
runc "github.com/containerd/go-runc"
35+
"github.com/containerd/ttrpc"
3536
"github.com/gogo/protobuf/types"
3637
"github.com/pkg/errors"
37-
"github.com/stevvooe/ttrpc"
3838
)
3939

4040
// Task on a linux based system

‎runtime/shim/client/client.go‎

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

3232
"golang.org/x/sys/unix"
3333

34+
"github.com/containerd/ttrpc"
3435
"github.com/pkg/errors"
3536
"github.com/sirupsen/logrus"
36-
"github.com/stevvooe/ttrpc"
3737

3838
"github.com/containerd/containerd/events"
3939
"github.com/containerd/containerd/log"

‎runtime/shim/v1/shim.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)