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

Merge pull request #2353 from ehazlett/process-runtime

Browse Source 
linux -> runtime/linux
This commit is contained in:
Derek McGowan
2018-05-30 10:06:36 -07:00
committed by GitHub
parent c7083eed5d 6653917ef9
commit 1e8b09cfc6
53 changed files with 237 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerd-shim/main_unix.go
View File

@@ -35,10 +35,10 @@ import (
"time"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux/proc"
"github.com/containerd/containerd/linux/shim"
shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/runtime/linux/proc"
"github.com/containerd/containerd/runtime/linux/shim"
shimapi "github.com/containerd/containerd/runtime/linux/shim/v1"
"github.com/containerd/typeurl"
ptypes "github.com/gogo/protobuf/types"
"github.com/pkg/errors"

2
cmd/containerd-shim/shim_darwin.go
View File

@@ -22,7 +22,7 @@ import (
"os"
"os/signal"
"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim"
runc "github.com/containerd/go-runc"
"github.com/stevvooe/ttrpc"
)

2
cmd/containerd-shim/shim_linux.go
View File

@@ -20,7 +20,7 @@ import (
"os"
"os/signal"
"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim"
runc "github.com/containerd/go-runc"
"github.com/opencontainers/runc/libcontainer/system"
"github.com/stevvooe/ttrpc"

2
cmd/containerd-shim/shim_unix.go
View File

@@ -22,7 +22,7 @@ import (
"os"
"os/signal"
"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/runtime/linux/shim"
runc "github.com/containerd/go-runc"
"github.com/stevvooe/ttrpc"
)

2
cmd/containerd/builtins_linux.go
View File

@@ -18,8 +18,8 @@ package main
import (
_ "github.com/containerd/aufs"
_ "github.com/containerd/containerd/linux"
_ "github.com/containerd/containerd/metrics/cgroups"
_ "github.com/containerd/containerd/runtime/linux"
_ "github.com/containerd/containerd/snapshots/native"
_ "github.com/containerd/containerd/snapshots/overlay"
_ "github.com/containerd/zfs"

2
cmd/ctr/commands/shim/shim.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/containerd/console"
"github.com/containerd/containerd/cmd/ctr/commands"
shim "github.com/containerd/containerd/linux/shim/v1"
shim "github.com/containerd/containerd/runtime/linux/shim/v1"
"github.com/containerd/typeurl"
ptypes "github.com/gogo/protobuf/types"
"github.com/opencontainers/runtime-spec/specs-go"