github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
1,452 Commits 3 Branches 2 Tags 112 MiB
ef026e83fa
Commit Graph

82 Commits

Author SHA1 Message Date
Stephen J Day
178b4275ca
api/types/container: nice enum values for status 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-18 17:48:20 -07:00
Evan Hazlett
70dd7fcc60 shim: Ps -> Processes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-18 11:05:48 -04:00
Evan Hazlett
ef158f8b5e add support to kill container process by pid 
This adds support for signalling a container process by pid.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

make Ps more extensible

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

ps: windows support

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-18 11:05:48 -04:00
Michael Crosby
cd282f458a Merge pull request #864 from mlaventure/revert-rootfs-error 
Revert "Merge pull request #853 from AkihiroSuda/check-rootfs"
 2017-05-16 15:05:27 -07:00
Kenfe-Mickael Laventure
dd16c0583b Revert "Merge pull request #853 from AkihiroSuda/check-rootfs" 
This reverts commit c1530b5b76, reversing
changes made to 3695ba77bb.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-16 14:48:13 -07:00
Kenfe-Mickael Laventure
5523936cf5 Close stdin on create if it wasn't requested and there's no terminal 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-16 14:16:47 -07:00
Kenfe-Mickael Laventure
aac425c761 Terminate linux shim on create failure 
Since an error is returned via the RPC clients will assume (rightly so)
that a call to the Delete() RPC is not necessary.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-16 13:31:06 -07:00
Kenfe-Mickaël Laventure
47718b0930 Merge pull request #861 from justincormack/go-runc-port 
Portability fixes for containerd shim
 2017-05-16 12:07:08 -07:00
Derek McGowan
c1530b5b76 Merge pull request #853 from AkihiroSuda/check-rootfs 
linux: error out if no rootfs specified
 2017-05-16 10:38:25 -07:00
Justin Cormack
6a571ecd40 Portability fixes for containerd shim 
Update go-runc to master with portability fixes.

Subreaper only exists on Linux, and only Linux runs the shim in a
mount namespace.

With these changes the shim compiles on Darwin, which means the
whole build compiles without errors now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-16 17:13:32 +01:00
Kenfe-Mickael Laventure
f95ad5a280 Don't print the transport closing error for shim events 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-15 15:27:40 -07:00
Kenfe-Mickael Laventure
0457b13043 Allow the shim binary to be specified 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-15 15:27:40 -07:00
Akihiro Suda
7a62734d82 linux: error out if no rootfs specified 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-14 14:03:26 +00:00
Michael Crosby
01b9f5ec67 Move Container and runtime to plugin pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-11 15:24:12 -07:00
Michael Crosby
23b2b09d13 Update deps after move to containerd org 
This updates containerd to use the latest versions of cgroups, fifo,
console, and go-runc from the containerd org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-10 16:51:48 -07:00
Michael Crosby
2f942e137d Wait for copy routines to be scheduled 
Fixes #770

Use a wait group to wait for the `io.Copy` go routines to be scheduled
before continuing to start the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-10 11:50:55 -07:00
Random-Liu
f04d74d099 Make it possible to disable stdin when terminal is enabled 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-05-05 13:34:29 -07:00
Krasi Georgiev
0e7e89c0f1 fixes #744 no-shim will crash containerd with ctr list and ctr info 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-05-01 18:03:02 +03:00
Qiang Huang
455a185d98 Merge pull request #740 from crosbymichael/oom-event 
Emit oom events
 2017-04-20 17:23:24 -05:00
Michael Crosby
eba88c1752 Add oom event to monitors 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 15:18:43 -07:00
Michael Crosby
efe177ed77 Add exited at to events and delete requests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 13:55:58 -07:00
Michael Crosby
e46109ba81 Only set socket on non-nil type creation 
Because of go interface unpacking we need to only set the interface on
the opts when we actually have a socket.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-13 09:47:14 -07:00
Michael Crosby
634f0c0c83 Set oom score for containerd and shims 
This adds a config option to set the oom score for the containerd daemon
as well as automatically setting the oom score for the shim's lauched so
that they are not killed until the very end of an out of memory
condition.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-12 11:34:32 -07:00
Michael Crosby
9e1acba19f Update deps with sys/unix changes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-10 13:07:41 -07:00
Michael Crosby
4f7d521510 [exec] Replace syscall with /x/sys/unix 
This replaces the syscall usage with sys/unix in the execution code

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-10 11:56:33 -07:00
Phil Estes
4f33aa2b5c Merge pull request #702 from crosbymichael/attach 
Expose Pty resize and CloseStdin RPCs
 2017-04-10 14:38:30 -04:00
Michael Crosby
7482962b9d Handle restore with dead shim 
Add functionality for restoring containers after containerd dies and is
restarted with terminated shims.

This ensures that on restore, if a container no longer has a running
shim, containerd will kill and cleanup the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-07 14:22:43 -07:00
Michael Crosby
a7da08b7ba Add Pty and CloseStdin RPCs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-07 11:20:10 -07:00
Kenfe-Mickael Laventure
c5843b7615 Initial windows runtime work 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-07 09:20:44 -07:00
Michael Crosby
47225c130c Add ctr exec 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-06 10:36:47 -07:00
Michael Crosby
7715ddcefa Add exec APIs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-05 11:51:56 -07:00
Qiang Huang
4764429cbe Add kill API for execution service 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-04-05 09:03:07 +08:00
Qiang Huang
6132bec05a Add Kill API for shim service 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-04-05 08:26:35 +08:00
Michael Crosby
4f2b443a27 Rewrite imports for new github org 
This rewrites the Go imports after switching to the new github org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-03 14:05:44 -07:00
Phil Estes
efb16dad44 Merge pull request #661 from crosbymichael/stdin-closer 
Open stdin write side in shim
 2017-04-03 12:25:43 -04:00
unclejack
d2a6630658 utils: remove utils & migrate code to sys 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-29 21:25:02 +03:00
Michael Crosby
b1fcb1745f Open stdin write side in shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-24 15:41:12 -07:00
Michael Crosby
5e5479718c Merge pull request #619 from crosbymichael/no-shim 
Add `no_shim` config for not running with a shim
 2017-03-22 13:49:03 -07:00
Michael Crosby
155185c2b2 Add container to monitor in runtime 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-22 11:44:25 -07:00
Ophir Sneh
87f94bf79b Update shim exec rpc to take fewer args 
Signed-off-by: Ophir Sneh <otsneh@gmail.com>
 2017-03-21 15:34:02 -07:00
Michael Crosby
1d7fa45403 Add no_shim config for not running with a shim 
This reuses the exiting shim code and services to let containerd run as
the reaper for all container processes without the use of a shim.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-10 15:28:21 -08:00
Michael Crosby
df48983fe7 Add reaper code for daemon 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-09 16:07:35 -08:00
Michael Crosby
e1731d2e5e Add linux runtime config 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-03-07 16:46:09 -08:00
Derek McGowan
0b44e24c07 Move plugin registration to separate package 
Only compile in plugin support on non-windows 1.8.
Re-enable go 1.7.x tests.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-03-06 17:23:00 -08:00
Akihiro Suda
899a52d655 api: implement fetching the container status 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-06 08:26:35 +00:00
Stephen Day
a15aa8e9ab Merge pull request #593 from ijc25/delete-response 
Return DeleteResponse from ContainerService.Delete
 2017-03-02 10:10:58 -08:00
Ian Campbell
186a9a2acd Return DeleteResponse from ContainerService.Delete 
The message was defined but the method was returning empty, plumb through the
result from the shim layer.

Compile tested only.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-03-01 14:59:29 +00:00
Ian Campbell
eae8ca69b7 Do not leak open fd to config.json in newBundle 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-03-01 11:15:10 +00:00
Michael Crosby
e693cad926 Change linux runtime(w shim) to builtin 
Because of the plugin findings and having the default runtime builtin
this makes it much better for development and testing.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-24 15:50:59 -08:00
Michael Crosby
fceafeb4d6 Remvoe go1.7 from travis 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-22 10:28:05 -08:00