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

rename runcopts to runctypes

Browse Source 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
This commit is contained in:
Jess Valarezo 2017-11-09 11:58:46 -08:00
parent 807f4d2ec7
commit 0961807715
10 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Protobuild.toml
View File

@ -41,8 +41,8 @@ ignore_files = [
# Lock down runc config # Lock down runc config
[[descriptors]] [[descriptors]]
prefix = "github.com/containerd/containerd/linux/runcopts" prefix = "github.com/containerd/containerd/linux/runctypes"
target = "linux/runcopts/next.pb.txt" target = "linux/runctypes/next.pb.txt"
ignore_files = [ ignore_files = [
"google/protobuf/descriptor.proto", "google/protobuf/descriptor.proto",
"gogoproto/gogo.proto" "gogoproto/gogo.proto"

8
container_linux_test.go
View File

@ -18,7 +18,7 @@ import (
"github.com/containerd/cgroups" "github.com/containerd/cgroups"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/linux/runcopts" "github.com/containerd/containerd/linux/runctypes"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -146,7 +146,7 @@ func TestShimInCgroup(t *testing.T) {
defer cg.Delete() defer cg.Delete()
task, err := container.NewTask(ctx, empty(), func(_ context.Context, client *Client, r *TaskInfo) error { task, err := container.NewTask(ctx, empty(), func(_ context.Context, client *Client, r *TaskInfo) error {
r.Options = &runcopts.CreateOptions{ r.Options = &runctypes.CreateOptions{
ShimCgroup: path, ShimCgroup: path,
} }
return nil return nil
@ -887,7 +887,7 @@ func TestContainerRuntimeOptions(t *testing.T) {
ctx, id, ctx, id,
WithNewSpec(withImageConfig(image), withExitStatus(7)), WithNewSpec(withImageConfig(image), withExitStatus(7)),
withNewSnapshot(id, image), withNewSnapshot(id, image),
WithRuntime("io.containerd.runtime.v1.linux", &runcopts.RuncOptions{Runtime: "no-runc"}), WithRuntime("io.containerd.runtime.v1.linux", &runctypes.RuncOptions{Runtime: "no-runc"}),
) )
if err != nil { if err != nil {
t.Error(err) t.Error(err)
@ -1040,7 +1040,7 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio, func(_ context.Context, client *Client, r *TaskInfo) error { task, err := container.NewTask(ctx, Stdio, func(_ context.Context, client *Client, r *TaskInfo) error {
r.Options = &runcopts.CreateOptions{ r.Options = &runctypes.CreateOptions{
IoUid: 1000, IoUid: 1000,
IoGid: 1000, IoGid: 1000,
} }

14
linux/bundle.go
View File

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/linux/runcopts" "github.com/containerd/containerd/linux/runctypes"
"github.com/containerd/containerd/linux/shim" "github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/linux/shim/client" "github.com/containerd/containerd/linux/shim/client"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -72,11 +72,11 @@ type bundle struct {
} }
// ShimOpt specifies shim options for initialization and connection // ShimOpt specifies shim options for initialization and connection
type ShimOpt func(*bundle, string, *runcopts.RuncOptions) (shim.Config, client.Opt) type ShimOpt func(*bundle, string, *runctypes.RuncOptions) (shim.Config, client.Opt)
// ShimRemote is a ShimOpt for connecting and starting a remote shim // ShimRemote is a ShimOpt for connecting and starting a remote shim
func ShimRemote(shimBinary, daemonAddress, cgroup string, nonewns, debug bool, exitHandler func()) ShimOpt { func ShimRemote(shimBinary, daemonAddress, cgroup string, nonewns, debug bool, exitHandler func()) ShimOpt {
return func(b *bundle, ns string, ropts *runcopts.RuncOptions) (shim.Config, client.Opt) { return func(b *bundle, ns string, ropts *runctypes.RuncOptions) (shim.Config, client.Opt) {
return b.shimConfig(ns, ropts), return b.shimConfig(ns, ropts),
client.WithStart(shimBinary, b.shimAddress(ns), daemonAddress, cgroup, nonewns, debug, exitHandler) client.WithStart(shimBinary, b.shimAddress(ns), daemonAddress, cgroup, nonewns, debug, exitHandler)
} }
@ -84,20 +84,20 @@ func ShimRemote(shimBinary, daemonAddress, cgroup string, nonewns, debug bool, e
// ShimLocal is a ShimOpt for using an in process shim implementation // ShimLocal is a ShimOpt for using an in process shim implementation
func ShimLocal(exchange *exchange.Exchange) ShimOpt { func ShimLocal(exchange *exchange.Exchange) ShimOpt {
return func(b *bundle, ns string, ropts *runcopts.RuncOptions) (shim.Config, client.Opt) { return func(b *bundle, ns string, ropts *runctypes.RuncOptions) (shim.Config, client.Opt) {
return b.shimConfig(ns, ropts), client.WithLocal(exchange) return b.shimConfig(ns, ropts), client.WithLocal(exchange)
} }
} }
// ShimConnect is a ShimOpt for connecting to an existing remote shim // ShimConnect is a ShimOpt for connecting to an existing remote shim
func ShimConnect() ShimOpt { func ShimConnect() ShimOpt {
return func(b *bundle, ns string, ropts *runcopts.RuncOptions) (shim.Config, client.Opt) { return func(b *bundle, ns string, ropts *runctypes.RuncOptions) (shim.Config, client.Opt) {
return b.shimConfig(ns, ropts), client.WithConnect(b.shimAddress(ns)) return b.shimConfig(ns, ropts), client.WithConnect(b.shimAddress(ns))
} }
} }
// NewShimClient connects to the shim managing the bundle and tasks creating it if needed // NewShimClient connects to the shim managing the bundle and tasks creating it if needed
func (b *bundle) NewShimClient(ctx context.Context, namespace string, getClientOpts ShimOpt, runcOpts *runcopts.RuncOptions) (*client.Client, error) { func (b *bundle) NewShimClient(ctx context.Context, namespace string, getClientOpts ShimOpt, runcOpts *runctypes.RuncOptions) (*client.Client, error) {
cfg, opt := getClientOpts(b, namespace, runcOpts) cfg, opt := getClientOpts(b, namespace, runcOpts)
return client.New(ctx, cfg, opt) return client.New(ctx, cfg, opt)
} }
@ -120,7 +120,7 @@ func (b *bundle) shimAddress(namespace string) string {
return filepath.Join(string(filepath.Separator), "containerd-shim", namespace, b.id, "shim.sock") return filepath.Join(string(filepath.Separator), "containerd-shim", namespace, b.id, "shim.sock")
} }
func (b *bundle) shimConfig(namespace string, runcOptions *runcopts.RuncOptions) shim.Config { func (b *bundle) shimConfig(namespace string, runcOptions *runctypes.RuncOptions) shim.Config {
var ( var (
criuPath string criuPath string
runtimeRoot string runtimeRoot string

4
linux/runcopts/next.pb.txt → linux/runctypes/next.pb.txt
View File

@ -1,5 +1,5 @@
file { file {
name: "github.com/containerd/containerd/linux/runcopts/runc.proto" name: "github.com/containerd/containerd/linux/runctypes/runc.proto"
package: "containerd.linux.runc" package: "containerd.linux.runc"
dependency: "gogoproto/gogo.proto" dependency: "gogoproto/gogo.proto"
message_type { message_type {
@ -176,7 +176,7 @@ file {
} }
} }
options { options {
go_package: "github.com/containerd/containerd/linux/runcopts;runcopts" go_package: "github.com/containerd/containerd/linux/runctypes;runctypes"
} }
syntax: "proto3" syntax: "proto3"
} }

80
linux/runcopts/runc.pb.go → linux/runctypes/runc.pb.go
View File

@ -1,11 +1,11 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: github.com/containerd/containerd/linux/runcopts/runc.proto // source: github.com/containerd/containerd/linux/runctypes/runc.proto
/* /*
Package runcopts is a generated protocol buffer package. Package runctypes is a generated protocol buffer package.
It is generated from these files: It is generated from these files:
github.com/containerd/containerd/linux/runcopts/runc.proto github.com/containerd/containerd/linux/runctypes/runc.proto
It has these top-level messages: It has these top-level messages:
RuncOptions RuncOptions
@ -13,7 +13,7 @@
CheckpointOptions CheckpointOptions
ProcessDetails ProcessDetails
*/ */
package runcopts package runctypes
import proto "github.com/gogo/protobuf/proto" import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
@ -1407,43 +1407,43 @@ var (
) )
func init() { func init() {
proto.RegisterFile("github.com/containerd/containerd/linux/runcopts/runc.proto", fileDescriptorRunc) proto.RegisterFile("github.com/containerd/containerd/linux/runctypes/runc.proto", fileDescriptorRunc)
} }
var fileDescriptorRunc = []byte{ var fileDescriptorRunc = []byte{
// 536 bytes of a gzipped FileDescriptorProto // 539 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x93, 0xc1, 0x6e, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x93, 0xc1, 0x6e, 0xd3, 0x4e,
0x10, 0x86, 0x6b, 0xda, 0x26, 0xce, 0xa4, 0x29, 0xb0, 0x50, 0xc9, 0x14, 0x91, 0x86, 0x00, 0x52, 0x10, 0xc6, 0xeb, 0x7f, 0xdb, 0xc4, 0x99, 0x34, 0xfd, 0xc3, 0x42, 0x25, 0x53, 0x44, 0x1a, 0x02,
0xb8, 0xa4, 0x12, 0x08, 0x09, 0xc1, 0xad, 0x2d, 0x42, 0x15, 0x50, 0x2a, 0x43, 0x2f, 0x5c, 0x56, 0x48, 0xe1, 0x92, 0x4a, 0x20, 0x2e, 0xf4, 0xd6, 0x16, 0xa1, 0x0a, 0x28, 0x95, 0x69, 0x2f, 0x5c,
0xee, 0x7a, 0x48, 0x56, 0x89, 0x77, 0x56, 0xbb, 0x6b, 0xea, 0xdc, 0xfa, 0x04, 0x3c, 0x57, 0x8f, 0x56, 0xee, 0x7a, 0x48, 0x56, 0x89, 0x77, 0x56, 0xbb, 0x6b, 0xea, 0xdc, 0xfa, 0x04, 0x3c, 0x57,
0x1c, 0x39, 0x21, 0x9a, 0x17, 0x01, 0x79, 0x6d, 0x17, 0xae, 0x5c, 0xb9, 0xfd, 0xf3, 0xfd, 0x63, 0x8f, 0x1c, 0x39, 0x21, 0x9a, 0x17, 0x01, 0x79, 0x6d, 0x17, 0xae, 0x5c, 0xb9, 0x7d, 0xf3, 0xfb,
0xcf, 0xe8, 0x5f, 0x0d, 0xbc, 0x98, 0x48, 0x37, 0xcd, 0x4f, 0xc7, 0x82, 0xb2, 0x5d, 0x41, 0xca, 0xc6, 0x9e, 0xd1, 0xb7, 0x1a, 0xd8, 0x9b, 0x48, 0x37, 0xcd, 0xcf, 0xc7, 0x82, 0xb2, 0x5d, 0x41,
0x25, 0x52, 0xa1, 0x49, 0xff, 0x96, 0x73, 0xa9, 0xf2, 0x62, 0xd7, 0xe4, 0x4a, 0x90, 0x76, 0xd6, 0xca, 0x25, 0x52, 0xa1, 0x49, 0xff, 0x94, 0x73, 0xa9, 0xf2, 0x62, 0xd7, 0xe4, 0x4a, 0xb8, 0x85,
0x8b, 0xb1, 0x36, 0xe4, 0x88, 0x6d, 0xfd, 0xe9, 0x1a, 0xfb, 0xae, 0x71, 0x69, 0x6e, 0xdf, 0x9e, 0x46, 0xeb, 0xd5, 0x58, 0x1b, 0x72, 0xc4, 0xb6, 0x7e, 0xb7, 0x8d, 0x7d, 0xdb, 0xb8, 0x34, 0xb7,
0xd0, 0x84, 0x7c, 0xc7, 0x6e, 0xa9, 0xaa, 0xe6, 0xe1, 0xd7, 0x00, 0xba, 0x71, 0xae, 0xc4, 0x7b, 0xef, 0x4e, 0x68, 0x42, 0xbe, 0x63, 0xb7, 0x54, 0x55, 0xf3, 0xf0, 0x4b, 0x00, 0xdd, 0x38, 0x57,
0xed, 0x24, 0x29, 0xcb, 0x22, 0x68, 0x9b, 0x5c, 0x39, 0x99, 0x61, 0x14, 0x0c, 0x82, 0x51, 0x27, 0xe2, 0xbd, 0x76, 0x92, 0x94, 0x65, 0x11, 0xb4, 0x4d, 0xae, 0x9c, 0xcc, 0x30, 0x0a, 0x06, 0xc1,
0x6e, 0x4a, 0x76, 0x1f, 0x36, 0x6a, 0xc9, 0x0d, 0x91, 0x8b, 0xae, 0x79, 0xbb, 0x5b, 0xb3, 0x98, 0xa8, 0x13, 0x37, 0x25, 0x7b, 0x08, 0x1b, 0xb5, 0xe4, 0x86, 0xc8, 0x45, 0xff, 0x79, 0xbb, 0x5b,
0xc8, 0xb1, 0xbb, 0xd0, 0x11, 0x46, 0xe6, 0x5c, 0x27, 0x6e, 0x1a, 0xad, 0x7a, 0x3f, 0x2c, 0xc1, 0xb3, 0x98, 0xc8, 0xb1, 0xfb, 0xd0, 0x11, 0x46, 0xe6, 0x5c, 0x27, 0x6e, 0x1a, 0xad, 0x7a, 0x3f,
0x71, 0xe2, 0xa6, 0xec, 0x11, 0x6c, 0xda, 0x85, 0x75, 0x98, 0xa5, 0x5c, 0x4c, 0x0c, 0xe5, 0x3a, 0x2c, 0xc1, 0x49, 0xe2, 0xa6, 0xec, 0x09, 0x6c, 0xda, 0x85, 0x75, 0x98, 0xa5, 0x5c, 0x4c, 0x0c,
0x5a, 0x1b, 0x04, 0xa3, 0x30, 0xee, 0xd5, 0x74, 0xdf, 0xc3, 0xe1, 0xf9, 0x2a, 0xf4, 0xf6, 0x0d, 0xe5, 0x3a, 0x5a, 0x1b, 0x04, 0xa3, 0x30, 0xee, 0xd5, 0xf4, 0xc0, 0xc3, 0xe1, 0xe5, 0x2a, 0xf4,
0x26, 0x0e, 0x9b, 0x95, 0x86, 0xd0, 0x53, 0xc4, 0xb5, 0xfc, 0x42, 0xae, 0x9a, 0x1c, 0xf8, 0xef, 0x0e, 0x0c, 0x26, 0x0e, 0x9b, 0x95, 0x86, 0xd0, 0x53, 0xc4, 0xb5, 0xfc, 0x4c, 0xae, 0x9a, 0x1c,
0xba, 0x8a, 0x8e, 0x4b, 0xe6, 0x27, 0xdf, 0x81, 0x90, 0x34, 0x2a, 0xee, 0x84, 0xf6, 0x8b, 0x85, 0xf8, 0xef, 0xba, 0x8a, 0x4e, 0x4a, 0xe6, 0x27, 0xdf, 0x83, 0x90, 0x34, 0x2a, 0xee, 0x84, 0xf6,
0x71, 0xbb, 0xac, 0x3f, 0x0a, 0xcd, 0x9e, 0xc0, 0x16, 0x16, 0x0e, 0x8d, 0x4a, 0xe6, 0x3c, 0x57, 0x8b, 0x85, 0x71, 0xbb, 0xac, 0x4f, 0x85, 0x66, 0xcf, 0x60, 0x0b, 0x0b, 0x87, 0x46, 0x25, 0x73,
0xb2, 0xe0, 0x96, 0xc4, 0x0c, 0x9d, 0xf5, 0x0b, 0x86, 0xf1, 0xad, 0xc6, 0x3c, 0x51, 0xb2, 0xf8, 0x9e, 0x2b, 0x59, 0x70, 0x4b, 0x62, 0x86, 0xce, 0xfa, 0x05, 0xc3, 0xf8, 0x4e, 0x63, 0x9e, 0x29,
0x50, 0x59, 0x6c, 0x1b, 0x42, 0x87, 0x26, 0x93, 0x2a, 0x99, 0xd7, 0x5b, 0x5e, 0xd5, 0xec, 0x1e, 0x59, 0x7c, 0xa8, 0x2c, 0xb6, 0x0d, 0xa1, 0x43, 0x93, 0x49, 0x95, 0xcc, 0xeb, 0x2d, 0x6f, 0x6a,
0xc0, 0x67, 0x39, 0x47, 0x3e, 0x27, 0x31, 0xb3, 0xd1, 0xba, 0x77, 0x3b, 0x25, 0x79, 0x5b, 0x02, 0xf6, 0x00, 0xe0, 0x93, 0x9c, 0x23, 0x9f, 0x93, 0x98, 0xd9, 0x68, 0xdd, 0xbb, 0x9d, 0x92, 0xbc,
0xf6, 0x18, 0x6e, 0x60, 0xa6, 0xdd, 0x82, 0xab, 0x24, 0x43, 0xab, 0x13, 0x81, 0x36, 0x6a, 0x0d, 0x2d, 0x01, 0x7b, 0x0a, 0xb7, 0x30, 0xd3, 0x6e, 0xc1, 0x55, 0x92, 0xa1, 0xd5, 0x89, 0x40, 0x1b,
0x56, 0x47, 0x9d, 0xf8, 0xba, 0xe7, 0x47, 0x57, 0xb8, 0x4c, 0xb4, 0x4a, 0xc2, 0xf2, 0x8c, 0x52, 0xb5, 0x06, 0xab, 0xa3, 0x4e, 0xfc, 0xbf, 0xe7, 0xc7, 0x37, 0xb8, 0x4c, 0xb4, 0x4a, 0xc2, 0xf2,
0x8c, 0xda, 0x55, 0xa2, 0x35, 0x7b, 0x47, 0x29, 0xb2, 0x87, 0xb0, 0xa9, 0x88, 0x2b, 0x3c, 0xe3, 0x8c, 0x52, 0x8c, 0xda, 0x55, 0xa2, 0x35, 0x7b, 0x47, 0x29, 0xb2, 0xc7, 0xb0, 0xa9, 0x88, 0x2b,
0x33, 0x5c, 0x18, 0xa9, 0x26, 0x51, 0xe8, 0x07, 0x6e, 0x28, 0x3a, 0xc2, 0xb3, 0x37, 0x15, 0x63, 0xbc, 0xe0, 0x33, 0x5c, 0x18, 0xa9, 0x26, 0x51, 0xe8, 0x07, 0x6e, 0x28, 0x3a, 0xc6, 0x8b, 0x37,
0x3b, 0xd0, 0xb5, 0x53, 0x99, 0x35, 0xb9, 0x76, 0xfc, 0x7f, 0xa0, 0x44, 0x55, 0xa8, 0x6c, 0x0b, 0x15, 0x63, 0x3b, 0xd0, 0xb5, 0x53, 0x99, 0x35, 0xb9, 0x76, 0xfc, 0x7f, 0xa0, 0x44, 0x55, 0xa8,
0x5a, 0x92, 0x78, 0x2e, 0xd3, 0x08, 0x06, 0xc1, 0xa8, 0x17, 0xaf, 0x4b, 0x3a, 0x91, 0x69, 0x8d, 0x6c, 0x0b, 0x5a, 0x92, 0x78, 0x2e, 0xd3, 0x08, 0x06, 0xc1, 0xa8, 0x17, 0xaf, 0x4b, 0x3a, 0x93,
0x27, 0x32, 0x8d, 0xba, 0x0d, 0x7e, 0x2d, 0xd3, 0xe1, 0xaf, 0x00, 0x6e, 0xee, 0x4f, 0x51, 0xcc, 0x69, 0x8d, 0x27, 0x32, 0x8d, 0xba, 0x0d, 0x7e, 0x2d, 0xd3, 0xe1, 0xcf, 0x00, 0x6e, 0x1f, 0x4c,
0x34, 0x49, 0xe5, 0x9a, 0x67, 0x60, 0xb0, 0x86, 0x85, 0x6c, 0xd2, 0xf7, 0xfa, 0x7f, 0x8d, 0x7d, 0x51, 0xcc, 0x34, 0x49, 0xe5, 0x9a, 0x67, 0x60, 0xb0, 0x86, 0x85, 0x6c, 0xd2, 0xf7, 0xfa, 0x5f,
0xf8, 0x0c, 0x36, 0x8f, 0x0d, 0x09, 0xb4, 0xf6, 0x00, 0x5d, 0x22, 0xe7, 0x96, 0x3d, 0x80, 0x36, 0x8d, 0x7d, 0xf8, 0x02, 0x36, 0x4f, 0x0c, 0x09, 0xb4, 0xf6, 0x10, 0x5d, 0x22, 0xe7, 0x96, 0x3d,
0x16, 0x28, 0xb8, 0x4c, 0xab, 0xbb, 0xd8, 0x83, 0xe5, 0x8f, 0x9d, 0xd6, 0xab, 0x02, 0xc5, 0xe1, 0x82, 0x36, 0x16, 0x28, 0xb8, 0x4c, 0xab, 0xbb, 0xd8, 0x87, 0xe5, 0xf7, 0x9d, 0xd6, 0xab, 0x02,
0x41, 0xdc, 0x2a, 0xad, 0xc3, 0x74, 0x2f, 0xbe, 0xb8, 0xec, 0xaf, 0x7c, 0xbf, 0xec, 0xaf, 0x9c, 0xc5, 0xd1, 0x61, 0xdc, 0x2a, 0xad, 0xa3, 0x74, 0xff, 0xf4, 0xea, 0xba, 0xbf, 0xf2, 0xed, 0xba,
0x2f, 0xfb, 0xc1, 0xc5, 0xb2, 0x1f, 0x7c, 0x5b, 0xf6, 0x83, 0x9f, 0xcb, 0x7e, 0xf0, 0xe9, 0xf9, 0xbf, 0x72, 0xb9, 0xec, 0x07, 0x57, 0xcb, 0x7e, 0xf0, 0x75, 0xd9, 0x0f, 0x7e, 0x2c, 0xfb, 0xc1,
0x3f, 0xde, 0xf3, 0xcb, 0x46, 0x9c, 0xb6, 0xfc, 0x9d, 0x3e, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x97, 0x7f, 0x7b, 0xd0, 0x7b, 0x37, 0xea, 0xbc, 0xe5, 0x2f, 0xf5, 0xf9, 0xaf, 0x00, 0x00,
0x15, 0x0d, 0x16, 0x1d, 0x12, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0x16, 0x9c, 0x1e, 0x15, 0x04, 0x00, 0x00,
} }

2
linux/runcopts/runc.proto → linux/runctypes/runc.proto
View File

@ -4,7 +4,7 @@ package containerd.linux.runc;
import "gogoproto/gogo.proto"; import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/linux/runcopts;runcopts"; option go_package = "github.com/containerd/containerd/linux/runctypes;runctypes";
message RuncOptions { message RuncOptions {
string runtime = 1; string runtime = 1;

8
linux/runtime.go
View File

@ -17,7 +17,7 @@ import (
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/identifiers"
"github.com/containerd/containerd/linux/runcopts" "github.com/containerd/containerd/linux/runctypes"
client "github.com/containerd/containerd/linux/shim" client "github.com/containerd/containerd/linux/shim"
shim "github.com/containerd/containerd/linux/shim/v1" shim "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
@ -193,7 +193,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
if err != nil { if err != nil {
return nil, err return nil, err
} }
cgroup = v.(*runcopts.CreateOptions).ShimCgroup cgroup = v.(*runctypes.CreateOptions).ShimCgroup
} }
exitHandler := func() { exitHandler := func() {
log.G(ctx).WithField("id", id).Info("shim reaped") log.G(ctx).WithField("id", id).Info("shim reaped")
@ -493,7 +493,7 @@ func (r *Runtime) getRuntime(ctx context.Context, ns, id string) (*runc.Runc, er
}, nil }, nil
} }
func (r *Runtime) getRuncOptions(ctx context.Context, id string) (*runcopts.RuncOptions, error) { func (r *Runtime) getRuncOptions(ctx context.Context, id string) (*runctypes.RuncOptions, error) {
var container containers.Container var container containers.Container
if err := r.db.View(func(tx *bolt.Tx) error { if err := r.db.View(func(tx *bolt.Tx) error {
@ -510,7 +510,7 @@ func (r *Runtime) getRuncOptions(ctx context.Context, id string) (*runcopts.Runc
if err != nil { if err != nil {
return nil, err return nil, err
} }
ropts, ok := v.(*runcopts.RuncOptions) ropts, ok := v.(*runctypes.RuncOptions)
if !ok { if !ok {
return nil, errors.New("invalid runtime options format") return nil, errors.New("invalid runtime options format")
} }

10
linux/shim/init.go
View File

@ -16,7 +16,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/identifiers"
"github.com/containerd/containerd/linux/runcopts" "github.com/containerd/containerd/linux/runctypes"
shimapi "github.com/containerd/containerd/linux/shim/v1" shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
@ -67,13 +67,13 @@ func (s *Service) newInitProcess(context context.Context, r *shimapi.CreateTaskR
if err := identifiers.Validate(r.ID); err != nil { if err := identifiers.Validate(r.ID); err != nil {
return nil, errors.Wrapf(err, "invalid task id") return nil, errors.Wrapf(err, "invalid task id")
} }
var options runcopts.CreateOptions var options runctypes.CreateOptions
if r.Options != nil { if r.Options != nil {
v, err := typeurl.UnmarshalAny(r.Options) v, err := typeurl.UnmarshalAny(r.Options)
if err != nil { if err != nil {
return nil, err return nil, err
} }
options = *v.(*runcopts.CreateOptions) options = *v.(*runctypes.CreateOptions)
} }
rootfs := filepath.Join(s.config.Path, "rootfs") rootfs := filepath.Join(s.config.Path, "rootfs")
@ -332,13 +332,13 @@ func (p *initProcess) Stdin() io.Closer {
} }
func (p *initProcess) checkpoint(context context.Context, r *shimapi.CheckpointTaskRequest) error { func (p *initProcess) checkpoint(context context.Context, r *shimapi.CheckpointTaskRequest) error {
var options runcopts.CheckpointOptions var options runctypes.CheckpointOptions
if r.Options != nil { if r.Options != nil {
v, err := typeurl.UnmarshalAny(r.Options) v, err := typeurl.UnmarshalAny(r.Options)
if err != nil { if err != nil {
return err return err
} }
options = *v.(*runcopts.CheckpointOptions) options = *v.(*runctypes.CheckpointOptions)
} }
var actions []runc.CheckpointAction var actions []runc.CheckpointAction
if !options.Exit { if !options.Exit {

4
linux/shim/service.go
View File

@ -15,7 +15,7 @@ import (
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux/runcopts" "github.com/containerd/containerd/linux/runctypes"
shimapi "github.com/containerd/containerd/linux/shim/v1" shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
@ -364,7 +364,7 @@ func (s *Service) ListPids(ctx context.Context, r *shimapi.ListPidsRequest) (*sh
} }
for _, p := range s.processes { for _, p := range s.processes {
if p.Pid() == int(pid) { if p.Pid() == int(pid) {
d := &runcopts.ProcessDetails{ d := &runctypes.ProcessDetails{
ExecID: p.ID(), ExecID: p.ID(),
} }
a, err := typeurl.MarshalAny(d) a, err := typeurl.MarshalAny(d)

4
task_opts.go
View File

@ -5,7 +5,7 @@ import (
"syscall" "syscall"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/linux/runcopts" "github.com/containerd/containerd/linux/runctypes"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
) )
@ -22,7 +22,7 @@ func WithRootFS(mounts []mount.Mount) NewTaskOpts {
// WithExit causes the task to exit after a successful checkpoint // WithExit causes the task to exit after a successful checkpoint
func WithExit(r *CheckpointTaskInfo) error { func WithExit(r *CheckpointTaskInfo) error {
r.Options = &runcopts.CheckpointOptions{ r.Options = &runctypes.CheckpointOptions{
Exit: true, Exit: true,
} }
return nil return nil