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

Update deps after move to containerd org

Browse Source 
This updates containerd to use the latest versions of cgroups, fifo,
console, and go-runc from the containerd org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-05-10 16:35:32 -07:00
parent 79e389e549
commit 23b2b09d13
76 changed files with 244 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux/runtime.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/plugin"
runc "github.com/crosbymichael/go-runc"
runc "github.com/containerd/go-runc"
"golang.org/x/net/context"
"golang.org/x/sys/unix"

2
linux/shim/client.go
View File

@@ -5,7 +5,7 @@ import (
shimapi "github.com/containerd/containerd/api/services/shim"
"github.com/containerd/containerd/api/types/container"
runc "github.com/crosbymichael/go-runc"
runc "github.com/containerd/go-runc"
google_protobuf "github.com/golang/protobuf/ptypes/empty"
"golang.org/x/net/context"
"golang.org/x/sys/unix"

6
linux/shim/exec.go
View File

@@ -15,11 +15,11 @@ import (
"golang.org/x/sys/unix"
"github.com/containerd/console"
shimapi "github.com/containerd/containerd/api/services/shim"
"github.com/crosbymichael/console"
runc "github.com/crosbymichael/go-runc"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/tonistiigi/fifo"
)
type execProcess struct {

6
linux/shim/init.go
View File

@@ -13,11 +13,11 @@ import (
"golang.org/x/sys/unix"
"github.com/containerd/console"
"github.com/containerd/containerd"
shimapi "github.com/containerd/containerd/api/services/shim"
"github.com/crosbymichael/console"
runc "github.com/crosbymichael/go-runc"
"github.com/tonistiigi/fifo"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
)
type initProcess struct {

6
linux/shim/io.go
View File

@@ -9,9 +9,9 @@ import (
"sync"
"syscall"
"github.com/crosbymichael/console"
runc "github.com/crosbymichael/go-runc"
"github.com/tonistiigi/fifo"
"github.com/containerd/console"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
)
func copyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg, cwg *sync.WaitGroup) error {

2
linux/shim/process.go
View File

@@ -7,7 +7,7 @@ import (
"io"
"time"
"github.com/crosbymichael/console"
"github.com/containerd/console"
)
type process interface {

2
linux/shim/service.go
View File

@@ -8,10 +8,10 @@ import (
"sync"
"syscall"
"github.com/containerd/console"
shimapi "github.com/containerd/containerd/api/services/shim"
"github.com/containerd/containerd/api/types/container"
"github.com/containerd/containerd/reaper"
"github.com/crosbymichael/console"
google_protobuf "github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
"golang.org/x/net/context"