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

Merge pull request #9364 from mxpv/runc

Browse Source 
Move runc shim implementation to cmd
This commit is contained in:
Derek McGowan 2023-11-15 21:23:52 +00:00 committed by GitHub
commit 4ef1bafd6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerd-shim-runc-v2/main.go
View File

@ -21,9 +21,9 @@ package main
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/runtime/v2/runc/manager" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/task/plugin" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
) )

2
runtime/v2/runc/manager/manager_linux.go → cmd/containerd-shim-runc-v2/manager/manager_linux.go
View File

@ -30,12 +30,12 @@ import (
"github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1" "github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/process" "github.com/containerd/containerd/v2/pkg/process"
"github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/pkg/schedcore"
"github.com/containerd/containerd/v2/runtime/v2/runc"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"

0
runtime/v2/runc/pause/sandbox.go → cmd/containerd-shim-runc-v2/pause/sandbox.go
View File

0
runtime/v2/runc/container.go → cmd/containerd-shim-runc-v2/runc/container.go
View File

0
runtime/v2/runc/platform.go → cmd/containerd-shim-runc-v2/runc/platform.go
View File

0
runtime/v2/runc/util.go → cmd/containerd-shim-runc-v2/runc/util.go
View File

2
runtime/v2/runc/task/plugin/plugin_linux.go → cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go
View File

@ -17,9 +17,9 @@
package plugin package plugin
import ( import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/task"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
runtime/v2/runc/task/service.go → cmd/containerd-shim-runc-v2/task/service.go
View File

@ -30,6 +30,7 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
@ -42,7 +43,6 @@ import (
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime" "github.com/containerd/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/sys/reaper" "github.com/containerd/containerd/v2/sys/reaper"

4
integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go
View File

@ -19,8 +19,8 @@ package main
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/runtime/v2/runc/manager" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
) )

2
integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go
View File

@ -24,11 +24,11 @@ import (
"strings" "strings"
taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/failpoint" "github.com/containerd/containerd/v2/pkg/failpoint"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/task"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"