Commit Graph

9017 Commits

Author SHA1 Message Date
Lantao Liu
9d5b5f9c26 Update containerd to cf09e32618.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 20:45:09 +00:00
Michael Crosby
cf09e32618 Merge pull request #1435 from Random-Liu/with-process-kill-all
WithProcessKill should kill all processes.
2017-08-28 14:49:18 -04:00
Lantao Liu
2f237b2fde WithProcessKill should kill all processes.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 18:39:00 +00:00
Kenfe-Mickaël Laventure
31b5bb9107 Merge pull request #1434 from crosbymichael/kill-all
Add KillOpts for killing all processes
2017-08-28 11:07:12 -07:00
Michael Crosby
ed6b8fb0aa Add KillOpts for killing all processes
Fixes #1431

This adds KillOpts so that a client can specify when they want to kill a
single process or all the processes inside a container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-28 13:29:47 -04:00
Lantao Liu
3b2d29be46 Merge pull request #177 from miaoyq/related-to-173
Exclude the event of sandbox containers from event stream
2017-08-28 10:00:21 -07:00
Michael Crosby
a19761874e Merge pull request #1428 from mlaventure/go1.9
Use golang 1.9 on CI
2017-08-28 10:56:28 -04:00
Michael Crosby
b9879d46f4 Merge pull request #1433 from Random-Liu/fix-with-user-id
WithUserID should not return error when /etc/passwd doesn't exist.
2017-08-28 10:10:41 -04:00
Yanqiang Miao
b18542c586 Excloude the event of sandbox containers from event stream
We should exclude the event of sandbox containers from event
stream in order to avoid outputting unexpected error print.

related #173

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-28 14:21:03 +08:00
Lantao Liu
410bcea236 WithUserID should not return error when /etc/passwd doesn't exist.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:57:49 +00:00
Lantao Liu
113964e499 Merge pull request #174 from Random-Liu/fix-network-teardown
Do not teardown when network namespace is removed already.
2017-08-27 22:56:43 -07:00
Lantao Liu
f46cd1a71a Disable pid namespace sharing
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:44:46 +00:00
Lantao Liu
fda30c3ad2 Do not teardown when network namespace is removed already.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:10:30 +00:00
Lantao Liu
8fd54d2f2d Merge pull request #172 from Random-Liu/fix-run-as-user
Fix run as user
2017-08-25 14:40:06 -07:00
Lantao Liu
270e09ab26 Use containerd WithUserID.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 21:11:56 +00:00
Lantao Liu
55d3abdb89 Update containerd to 360e46ddda
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 21:11:56 +00:00
Lantao Liu
980e8e8007 Merge pull request #168 from Random-Liu/add-run-as-user
Add RunAsUser support
2017-08-25 13:45:47 -07:00
Michael Crosby
360e46ddda Merge pull request #1429 from dmcgowan/client-use-root-path
Use RootPath for resolving path inside of an image
2017-08-25 16:23:28 -04:00
Derek McGowan
44e266b7a7
Use RootPath for resolving path inside of an image
Prevents unintentional lookup of host passwd file

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-25 13:16:46 -07:00
Michael Crosby
e4a77fcc0a Merge pull request #1425 from Random-Liu/add-with-user-id
Add WithUserID which gets uid and gid from image's /etc/passwd.
2017-08-25 16:00:49 -04:00
Lantao Liu
bb9e2bfa43 Add WithUserID which gets uid and gid from image's /etc/passwd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 19:52:48 +00:00
Derek McGowan
ab1968d590 Merge pull request #1427 from crosbymichael/states
Add procesStates for shim processes
2017-08-25 12:03:27 -07:00
Derek McGowan
fb427da12f Merge pull request #1424 from crosbymichael/load-exec
Add LoadProcess api to Task
2017-08-25 11:50:56 -07:00
Derek McGowan
1a77db1a2a Merge pull request #1423 from crosbymichael/events
Add Events client method
2017-08-25 11:45:55 -07:00
Michael Crosby
967497097a Add procesStates for shim processes
Use the state pattern to handle process transitions from one state to
another and what actions can be performed on a process in a specific
state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-25 14:03:55 -04:00
Kenfe-Mickael Laventure
34c25e07e8
Use golang 1.9 on AppVeyor CI
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-25 08:58:40 -07:00
Kenfe-Mickael Laventure
77b98f0590
Use golang 1.9 on Travis CI
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-25 08:34:04 -07:00
Lantao Liu
7313331f2e Merge pull request #171 from Random-Liu/not-checkpoint-sandbox-pid
Do not checkpoint sandbox pid.
2017-08-24 20:23:16 -07:00
Lantao Liu
60d8430ac1 Do not checkpoint sandbox pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 01:38:05 +00:00
Lantao Liu
a80df151d1 Add RunAsUsername support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 00:47:35 +00:00
Lantao Liu
e1f74f00a5 Various security related fixes
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 21:52:30 +00:00
Lantao Liu
8d1b737480 Update containerd to a6ce1ef2a1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 21:47:52 +00:00
Lantao Liu
e559804b37 Merge pull request #167 from Random-Liu/remove-unused-code
Remove unused code.
2017-08-24 14:43:23 -07:00
Lantao Liu
b671465d7f Merge pull request #165 from Random-Liu/fix-node-e2e
Not printing any log for node e2e.
2017-08-24 14:42:58 -07:00
Michael Crosby
b3303b55c1 Add LoadProcess api to Task
Fixes #1374

This adds a `LoadProcess` api to load existing exec'd processes from a
task.  It allows reattaching of IO and waiting on the process.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 16:30:34 -04:00
Lantao Liu
6f679fd175 Merge pull request #161 from Random-Liu/sandbox-createdat-from-containerd
Get CreatedAt from containerd instead of maintaining it ourselves.
2017-08-24 12:01:50 -07:00
Kenfe-Mickaël Laventure
a6ce1ef2a1 Merge pull request #1413 from crosbymichael/user-opts
Implement WithUsername for /etc/passwd lookup
2017-08-24 11:49:23 -07:00
Lantao Liu
a795927c5a Get CreatedAt from containerd instead of maintaining it ourselves.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 18:38:00 +00:00
Michael Crosby
2052b76fa7 Change WithSpec to take SpecOpts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 14:32:41 -04:00
Lantao Liu
73bb9696e8 Merge pull request #151 from Random-Liu/add-instrumented-service
Add instrumented service.
2017-08-24 11:26:39 -07:00
Lantao Liu
36da027c20 Merge pull request #138 from abhinandanpb/p_netns
Creating sandbox namespace
2017-08-24 11:26:21 -07:00
Lantao Liu
c6895d0856 Remove unused code.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 18:04:05 +00:00
Lantao Liu
c6191122f2 Merge pull request #163 from abhinandanpb/containerd-alpha6
Updating to container1.0-alpha
2017-08-24 10:43:43 -07:00
Abhinandan Prativadi
5a119200b8 Creating permanent sandbox namespace
This commit contains changes to create/delete permanent namespace
for a sandbox container.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-24 10:43:42 -07:00
Lantao Liu
26e3718d6b Not printing any log for node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 17:20:59 +00:00
Lantao Liu
b27ee85f74 Merge pull request #146 from zhangzhenhao/master
add the user id support of runAsUser
2017-08-24 10:18:26 -07:00
zhangzhenhao
331e542c09 add the user id support of runAsUser
Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
2017-08-24 23:29:45 +08:00
Michael Crosby
421c607c54 Add Events client method
Fixes #1381

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 11:10:01 -04:00
Michael Crosby
5c7f67186a Add libcontainer/user package for passwd parsing
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 10:32:16 -04:00
Michael Crosby
f66f0fb7a0 Update windows SpecOpts in tests
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 10:32:16 -04:00