Skip to content

Commit 3a03f02

Browse files
dmcgowandmcgowan
committed
Move runc options to api directory
Signed-off-by: Derek McGowan <[email protected]>
1 parent 26864c8 commit 3a03f02

28 files changed

Lines changed: 273 additions & 118 deletions

‎Protobuild.toml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,3 @@ generators = ["go"]
1212
# `/usr/local/include` to pickup the common install location of protobuf.
1313
# This is the default.
1414
after = ["/usr/local/include", "/usr/include"]
15-
16-
[[descriptors]]
17-
prefix = "github.com/containerd/containerd/core/runtime/v2/runc/options"
18-
target = "core/runtime/v2/runc/options/next.pb.txt"
19-
ignore_files = [
20-
"google/protobuf/descriptor.proto",
21-
]

‎api/next.pb.txt‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7147,6 +7147,167 @@ file {
71477147
}
71487148
syntax: "proto3"
71497149
}
7150+
file {
7151+
name: "github.com/containerd/containerd/api/types/runc/options/oci.proto"
7152+
package: "containerd.runc.v1"
7153+
message_type {
7154+
name: "Options"
7155+
field {
7156+
name: "no_pivot_root"
7157+
number: 1
7158+
label: LABEL_OPTIONAL
7159+
type: TYPE_BOOL
7160+
json_name: "noPivotRoot"
7161+
}
7162+
field {
7163+
name: "no_new_keyring"
7164+
number: 2
7165+
label: LABEL_OPTIONAL
7166+
type: TYPE_BOOL
7167+
json_name: "noNewKeyring"
7168+
}
7169+
field {
7170+
name: "shim_cgroup"
7171+
number: 3
7172+
label: LABEL_OPTIONAL
7173+
type: TYPE_STRING
7174+
json_name: "shimCgroup"
7175+
}
7176+
field {
7177+
name: "io_uid"
7178+
number: 4
7179+
label: LABEL_OPTIONAL
7180+
type: TYPE_UINT32
7181+
json_name: "ioUid"
7182+
}
7183+
field {
7184+
name: "io_gid"
7185+
number: 5
7186+
label: LABEL_OPTIONAL
7187+
type: TYPE_UINT32
7188+
json_name: "ioGid"
7189+
}
7190+
field {
7191+
name: "binary_name"
7192+
number: 6
7193+
label: LABEL_OPTIONAL
7194+
type: TYPE_STRING
7195+
json_name: "binaryName"
7196+
}
7197+
field {
7198+
name: "root"
7199+
number: 7
7200+
label: LABEL_OPTIONAL
7201+
type: TYPE_STRING
7202+
json_name: "root"
7203+
}
7204+
field {
7205+
name: "systemd_cgroup"
7206+
number: 9
7207+
label: LABEL_OPTIONAL
7208+
type: TYPE_BOOL
7209+
json_name: "systemdCgroup"
7210+
}
7211+
field {
7212+
name: "criu_image_path"
7213+
number: 10
7214+
label: LABEL_OPTIONAL
7215+
type: TYPE_STRING
7216+
json_name: "criuImagePath"
7217+
}
7218+
field {
7219+
name: "criu_work_path"
7220+
number: 11
7221+
label: LABEL_OPTIONAL
7222+
type: TYPE_STRING
7223+
json_name: "criuWorkPath"
7224+
}
7225+
reserved_range {
7226+
start: 8
7227+
end: 9
7228+
}
7229+
}
7230+
message_type {
7231+
name: "CheckpointOptions"
7232+
field {
7233+
name: "exit"
7234+
number: 1
7235+
label: LABEL_OPTIONAL
7236+
type: TYPE_BOOL
7237+
json_name: "exit"
7238+
}
7239+
field {
7240+
name: "open_tcp"
7241+
number: 2
7242+
label: LABEL_OPTIONAL
7243+
type: TYPE_BOOL
7244+
json_name: "openTcp"
7245+
}
7246+
field {
7247+
name: "external_unix_sockets"
7248+
number: 3
7249+
label: LABEL_OPTIONAL
7250+
type: TYPE_BOOL
7251+
json_name: "externalUnixSockets"
7252+
}
7253+
field {
7254+
name: "terminal"
7255+
number: 4
7256+
label: LABEL_OPTIONAL
7257+
type: TYPE_BOOL
7258+
json_name: "terminal"
7259+
}
7260+
field {
7261+
name: "file_locks"
7262+
number: 5
7263+
label: LABEL_OPTIONAL
7264+
type: TYPE_BOOL
7265+
json_name: "fileLocks"
7266+
}
7267+
field {
7268+
name: "empty_namespaces"
7269+
number: 6
7270+
label: LABEL_REPEATED
7271+
type: TYPE_STRING
7272+
json_name: "emptyNamespaces"
7273+
}
7274+
field {
7275+
name: "cgroups_mode"
7276+
number: 7
7277+
label: LABEL_OPTIONAL
7278+
type: TYPE_STRING
7279+
json_name: "cgroupsMode"
7280+
}
7281+
field {
7282+
name: "image_path"
7283+
number: 8
7284+
label: LABEL_OPTIONAL
7285+
type: TYPE_STRING
7286+
json_name: "imagePath"
7287+
}
7288+
field {
7289+
name: "work_path"
7290+
number: 9
7291+
label: LABEL_OPTIONAL
7292+
type: TYPE_STRING
7293+
json_name: "workPath"
7294+
}
7295+
}
7296+
message_type {
7297+
name: "ProcessDetails"
7298+
field {
7299+
name: "exec_id"
7300+
number: 1
7301+
label: LABEL_OPTIONAL
7302+
type: TYPE_STRING
7303+
json_name: "execId"
7304+
}
7305+
}
7306+
options {
7307+
go_package: "github.com/containerd/containerd/v2/api/types/runc/options;options"
7308+
}
7309+
syntax: "proto3"
7310+
}
71507311
file {
71517312
name: "github.com/containerd/containerd/api/types/transfer/imagestore.proto"
71527313
package: "containerd.types.transfer"

core/runtime/v2/runc/options/doc.go renamed to api/types/runc/options/doc.go

File renamed without changes.

core/runtime/v2/runc/options/next.pb.txt renamed to api/types/runc/options/next.pb.txt

File renamed without changes.

core/runtime/v2/runc/options/oci.pb.go renamed to api/types/runc/options/oci.pb.go

Lines changed: 89 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/runtime/v2/runc/options/oci.proto renamed to api/types/runc/options/oci.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package containerd.runc.v1;
44

5-
option go_package = "github.com/containerd/containerd/v2/core/runtime/v2/runc/options;options";
5+
option go_package = "github.com/containerd/containerd/v2/api/types/runc/options;options";
66

77
message Options {
88
// disable pivot root when creating a container

‎client/container.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626

2727
"github.com/containerd/containerd/v2/api/services/tasks/v1"
2828
"github.com/containerd/containerd/v2/api/types"
29+
"github.com/containerd/containerd/v2/api/types/runc/options"
2930
tasktypes "github.com/containerd/containerd/v2/api/types/task"
3031
"github.com/containerd/containerd/v2/core/containers"
3132
"github.com/containerd/containerd/v2/core/images"
32-
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
3333
"github.com/containerd/containerd/v2/pkg/cio"
3434
"github.com/containerd/containerd/v2/pkg/oci"
3535
"github.com/containerd/containerd/v2/protobuf"

‎client/container_checkpoint_opts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"runtime"
2525

2626
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
27+
"github.com/containerd/containerd/v2/api/types/runc/options"
2728
"github.com/containerd/containerd/v2/core/containers"
2829
"github.com/containerd/containerd/v2/core/diff"
2930
"github.com/containerd/containerd/v2/core/images"
30-
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
3131
"github.com/containerd/containerd/v2/pkg/rootfs"
3232
"github.com/containerd/containerd/v2/protobuf"
3333
"github.com/containerd/containerd/v2/protobuf/proto"

‎client/task.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828

2929
"github.com/containerd/containerd/v2/api/services/tasks/v1"
3030
"github.com/containerd/containerd/v2/api/types"
31+
"github.com/containerd/containerd/v2/api/types/runc/options"
3132
"github.com/containerd/containerd/v2/core/content"
3233
"github.com/containerd/containerd/v2/core/diff"
3334
"github.com/containerd/containerd/v2/core/images"
3435
"github.com/containerd/containerd/v2/core/mount"
35-
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
3636
"github.com/containerd/containerd/v2/pkg/cio"
3737
"github.com/containerd/containerd/v2/pkg/oci"
3838
"github.com/containerd/containerd/v2/pkg/rootfs"

‎client/task_opts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"syscall"
2424

2525
"github.com/containerd/containerd/v2/api/types"
26+
"github.com/containerd/containerd/v2/api/types/runc/options"
2627
"github.com/containerd/containerd/v2/core/images"
2728
"github.com/containerd/containerd/v2/core/mount"
28-
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
2929
"github.com/containerd/errdefs"
3030
"github.com/opencontainers/runtime-spec/specs-go"
3131
)

0 commit comments

Comments
 (0)