Skip to content

Commit ab8586b

Browse files
crosbymichaelcrosbymichael
committed
Remove bundles from API
Signed-off-by: Michael Crosby <[email protected]>
1 parent 1dc5d65 commit ab8586b

48 files changed

Lines changed: 3240 additions & 5899 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/services/execution/execution.pb.go‎

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

‎api/services/execution/execution.proto‎

Lines changed: 26 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -3,116 +3,54 @@ syntax = "proto3";
33
package containerd.v1.services;
44

55
import "google/protobuf/empty.proto";
6+
import "google/protobuf/any.proto";
67
import "gogoproto/gogo.proto";
8+
import "github.com/docker/containerd/api/types/mount/mount.proto";
79
import "github.com/docker/containerd/api/types/container/container.proto";
8-
import "github.com/docker/containerd/api/types/process/process.proto";
910

10-
service ExecutionService {
11-
rpc CreateContainer(CreateContainerRequest) returns (CreateContainerResponse);
12-
rpc StartContainer(StartContainerRequest) returns (google.protobuf.Empty);
13-
rpc UpdateContainer(UpdateContainerRequest) returns (google.protobuf.Empty);
14-
rpc PauseContainer(PauseContainerRequest) returns (google.protobuf.Empty);
15-
rpc ResumeContainer(ResumeContainerRequest) returns (google.protobuf.Empty);
16-
rpc DeleteContainer(DeleteContainerRequest) returns (google.protobuf.Empty);
17-
rpc GetContainer(GetContainerRequest) returns (GetContainerResponse);
18-
rpc ListContainers(ListContainersRequest) returns (ListContainersResponse);
19-
20-
rpc StartProcess(StartProcessRequest) returns (StartProcessResponse);
21-
rpc GetProcess(GetProcessRequest) returns (GetProcessResponse);
22-
rpc SignalProcess(SignalProcessRequest) returns (google.protobuf.Empty);
23-
rpc DeleteProcess(DeleteProcessRequest) returns (google.protobuf.Empty);
24-
rpc ListProcesses(ListProcessesRequest) returns (ListProcessesResponse);
25-
}
26-
27-
message StartContainerRequest {
28-
string id = 1 [(gogoproto.customname) = "ID"];
11+
service ContainerService {
12+
rpc Create(CreateRequest) returns (CreateResponse);
13+
rpc Start(StartRequest) returns (google.protobuf.Empty);
14+
rpc Delete(DeleteRequest) returns (google.protobuf.Empty);
15+
rpc List(ListRequest) returns (ListResponse);
16+
rpc Events(EventsRequest) returns (stream containerd.v1.types.Event);
2917
}
3018

31-
32-
message CreateContainerRequest {
19+
message CreateRequest {
3320
string id = 1 [(gogoproto.customname) = "ID"];
34-
string bundle_path = 2;
35-
bool console = 3;
36-
string stdin = 4;
37-
string stdout = 5;
38-
string stderr = 6;
39-
}
40-
41-
message CreateContainerResponse {
42-
types.Container container = 1;
43-
types.Process initProcess = 2;
21+
google.protobuf.Any spec = 2;
22+
repeated containerd.v1.types.Mount rootfs = 3;
23+
string runtime = 4;
24+
string stdin = 5;
25+
string stdout = 6;
26+
string stderr = 7;
27+
bool terminal = 8;
4428
}
4529

46-
message DeleteContainerRequest {
30+
message CreateResponse {
4731
string id = 1 [(gogoproto.customname) = "ID"];
32+
uint32 pid = 2;
4833
}
4934

50-
message ListContainersRequest {
51-
repeated string owner = 1;
52-
}
53-
54-
message ListContainersResponse {
55-
repeated types.Container containers = 1;
56-
}
57-
58-
message StartProcessRequest {
59-
string container_id = 1 [(gogoproto.customname) = "ContainerID"];
60-
types.Process process = 2;
61-
bool console = 3;
62-
string stdin = 4;
63-
string stdout = 5;
64-
string stderr = 6;
65-
}
66-
67-
message StartProcessResponse {
68-
types.Process process = 1;
69-
}
70-
71-
message GetContainerRequest {
35+
message StartRequest {
7236
string id = 1 [(gogoproto.customname) = "ID"];
7337
}
7438

75-
message GetContainerResponse {
76-
types.Container container = 1;
77-
}
78-
79-
message UpdateContainerRequest {
80-
string container_id = 1 [(gogoproto.customname) = "ContainerID"];
81-
string bundle_path = 2;
82-
}
83-
84-
message PauseContainerRequest {
39+
message DeleteRequest {
8540
string id = 1 [(gogoproto.customname) = "ID"];
8641
}
8742

88-
message ResumeContainerRequest {
43+
message DeleteResponse {
8944
string id = 1 [(gogoproto.customname) = "ID"];
45+
uint32 exit_status = 2;
9046
}
9147

92-
message GetProcessRequest {
93-
string container_id = 1 [(gogoproto.customname) = "ContainerID"];
94-
uint32 pid = 2;
95-
}
96-
97-
message GetProcessResponse {
98-
types.Process process = 1;
99-
}
100-
101-
message SignalProcessRequest {
102-
string container_id = 1 [(gogoproto.customname) = "ContainerID"];
103-
uint32 pid = 2;
104-
uint32 signal = 3;
105-
}
106-
107-
message DeleteProcessRequest {
108-
string container_id = 1 [(gogoproto.customname) = "ContainerID"];
109-
uint32 pid = 2;
48+
message ListRequest {
11049
}
11150

112-
message ListProcessesRequest {
113-
string container_id = 1 [(gogoproto.customname) = "ContainerID"];
51+
message ListResponse {
52+
repeated containerd.v1.types.Container containers = 1;
11453
}
11554

116-
message ListProcessesResponse {
117-
repeated types.Process processes = 1;
55+
message EventsRequest {
11856
}

0 commit comments

Comments
 (0)