vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity
730 commits 2 branches 0 tags 33 MiB
Commit graph

730 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
c3da771256 Merge pull request #241 from mlaventure/makefile-improv 
Makefile improv
 2016-05-17 15:54:48 -07:00
Kenfe-Mickael Laventure
496007897f Remove unneeded compilation when running test 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-13 11:44:33 -07:00
Kenfe-Mickael Laventure
552547834b Install containerd binaries into built docker image 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-13 11:44:01 -07:00
Stephen J Day
41aadb3fb0 log: replace grpc logger with logrus 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-05-12 15:53:32 -07:00
Kenfe-Mickaël Laventure
57b7c3da91 Merge pull request #237 from crosbymichael/create-status 
Use state for container create
 2016-05-09 14:55:08 -07:00
Michael Crosby
6fae7fd8fc Use state for container create 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-09 14:51:19 -07:00
Michael Crosby
f1582e73c3 Merge pull request #236 from mlaventure/add-version-rpc 
Add version rpc
 2016-05-09 14:19:07 -07:00
Kenfe-Mickael Laventure
efc47463cd Add new version command to ctr 
This method allow retrieving the target daemon version information.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-09 11:38:41 -07:00
Kenfe-Mickael Laventure
ba465c17a7 Add new GetServerVersion rpc method 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-09 11:38:28 -07:00
Michael Crosby
9344ea9d7d Merge pull request #235 from mlaventure/update-via-runc 
Use the new runtime update command to process UpdateResources requests
 2016-05-09 11:27:00 -07:00
Kenfe-Mickael Laventure
1ebdf69a58 Use the new runtime update command to process UpdateResources requests 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-09 11:21:45 -07:00
Kenfe-Mickael Laventure
2f69e11b1a Vendor in runc d49ece5a83da3dcb820121d6850e2b61bd0a5fbe 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-09 08:53:43 -07:00
Michael Crosby
3062918899 Merge pull request #230 from amitkris/uprev_solaris_deps 
uprev dependencies required for build clean on Solaris
 2016-05-06 10:48:49 -07:00
Michael Crosby
269487be8f Merge pull request #231 from mlaventure/fix-ctr-file-leak-and-exec-after-restore 
Fix ctr file leak and exec after restore
 2016-05-06 10:45:31 -07:00
Michael Crosby
121437994c Merge pull request #226 from hqhq/hq_fix_epoll_arm64 
Correct build flag for arm64
 2016-05-06 10:40:41 -07:00
Kenfe-Mickaël Laventure
eb9807ea22 Merge pull request #232 from crosbymichael/update-runc 
Update runc to 89c3c97a8482f3a57cd4bb683df1a7b2c61405d8
 2016-05-04 11:43:34 -07:00
Michael Crosby
4a341841c5 Update runc to 89c3c97a8482f3a57cd4bb683df1a7b2c61405d8 
Fixes #211

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-04 11:36:07 -07:00
Kenfe-Mickael Laventure
7979ac24fe Fix restore to correctly set the exec timeout value (containerd) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-02 14:04:14 -07:00
Kenfe-Mickael Laventure
7279ff91c4 Add missing shim value when saving container state.json (containerd) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-02 14:02:52 -07:00
Kenfe-Mickael Laventure
5a688c3e28 Cleanup stdio files upon start and exec termination (ctr). 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-02 13:59:40 -07:00
Amit Krishnan
aff023c8a2 Uprev docker/docker/pkg/term and runc/libcontainer 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-05-02 13:40:23 -07:00
Michael Crosby
c0a78ae10d Merge pull request #229 from mrunalp/fix_state_cmd 
Add missing state command to command list
 2016-04-29 16:20:47 -07:00
Mrunal Patel
79de8a2fc5 Add missing state command to command list 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-04-29 16:08:11 -07:00
Qiang Huang
313db3df26 Correct build flag for arm64 
On arm64, the default build flag is the same as the one from
`go env` which is arm64. So we should use arm64 instead of
aarch64 for both build flag and file name.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-04-29 11:42:41 +00:00
Michael Crosby
f0f0c3e0dc Merge pull request #223 from crosbymichael/reap-shim 
Remove sigchld reaper from containerd process
 2016-04-28 14:23:05 -07:00
Michael Crosby
d8c3cd8107 Merge pull request #224 from tonistiigi/fix-memory-stats 
Fix including memory stats field
 2016-04-28 11:38:46 -07:00
Tonis Tiigi
62c89c1c50 Fix including memory stats field 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-04-27 18:42:16 -07:00
Michael Crosby
847690583f Remove sigchld reaper from containerd process 
Because we are launching alot of different runc commands to do
operations there is a race between doing a `cmd.Wait()` and getting the
sigchld and reaping it.  We can remove the sigchild reaper from
containerd as long as we make sure we reap the shim process if we are
the parent, i.e. not restored.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-27 16:02:03 -07:00
Kenfe-Mickaël Laventure
25de9de446 Merge pull request #214 from HuKeping/constant 
Replace exit codes by Constants
 2016-04-26 16:46:23 -07:00
Kenfe-Mickaël Laventure
92eeb02a7b Merge pull request #221 from crosbymichael/runc-cmds 
Use runc ps and events for stats and pids
 2016-04-26 16:45:46 -07:00
Michael Crosby
db789045bd Update runc in dockerfile for new commands 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 15:06:25 -07:00
Michael Crosby
9ed8422e8c Use runc events --stats for collecting stats 
runc `events --stats` now has stable output so we don't need to bind to
libcontainer directly to get stats output for the containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 14:57:30 -07:00
Michael Crosby
c2df6e08cf Use runc for getting list of processes 
runc now has a `ps` command with json output to support listing all the
processes inside a container.  We no longer need to use libcontainer
directly for doing this.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 14:40:05 -07:00
Michael Crosby
f279c4a878 Merge pull request #219 from crosbymichael/remove-win 
Remove windows files
 2016-04-26 14:34:28 -07:00
Michael Crosby
f7f4d8677f Remove windows code and simplify linux 
Windows will not use containerd and its just unused code and unneed
complexity to keep it all around.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 14:10:41 -07:00
Michael Crosby
31270bba69 Remove windows files 
Windows is not going to use containerd because there is already a
similar implementation on windows.  This removes all the windows files
because there is no reason to keep this overhead when its not going to
be used.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 14:10:33 -07:00
Michael Crosby
79c35e0306 Merge pull request #218 from crosbymichael/bump_runc 
Update runc and runtime-specs dependencies
 2016-04-26 14:05:44 -07:00
Michael Crosby
c44f03a1bf Merge pull request #215 from HuKeping/runtime_status 
Bugfix: ctr container list can not get the proper status of container
 2016-04-26 13:43:47 -07:00
Michael Crosby
7a1d28e42b Bump runc and runtime-specs deps 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 13:38:36 -07:00
Michael Crosby
715ac711b8 Merge pull request #217 from ibuildthecloud/delete-args 
Pass runtime args to runtime delete call from shim
 2016-04-26 11:22:06 -07:00
Darren Shepherd
2347cc9dc3 Pass runtime args to runtime delete call from shim 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2016-04-26 11:14:37 -07:00
HuKeping
ca7c504068 Bugfix: ctr container list can not get the proper status of container 
Prior to this patch, when list containers by "ctr containers" or
"ctr containers xxx", it will not get the proper status of conatinser(s).

That was caused by the wrong implementation of State() for structure process,
it only send a signal "0" to ping the "init" process and do nothing.

Since the OCI/runc has implemented an interface Status(), we can use that.
And I think this is more compatible with the design for containerd:
- containerd -> runtime -> fun()

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2016-04-26 07:04:26 -04:00
HuKeping
10800f62ae Use constant to replace integer literal 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2016-04-26 06:02:49 -04:00
HuKeping
165815fdbf Introduce a ctr wide constant 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2016-04-26 06:01:25 -04:00
HuKeping
40d42a1aac Rework function getContainers 
- Use canonical way to check if a map contains a key.
- Use "ci" to keep consistence since it is for "containerInfo".

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2016-04-22 17:32:41 -04:00
HuKeping
9d30093505 Interface: introduce status to runtime container 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2016-04-22 16:09:50 -04:00
Kenfe-Mickaël Laventure
0e9e24c647 Merge pull request #178 from cyphar/add-socket-activation 
containerd: use pkg/listeners to create the GRPC socket
 2016-04-23 05:52:35 +10:00
Aleksa Sarai
e3bb2b6c39 integration-test: use new --listen proto://address format 
This re-enables the integration tests after the CLI UX change of
--listen.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-23 02:20:46 +10:00
Aleksa Sarai
0ec0bb380f ctr: support proto://address format for --address 
In order to match the containerd --listen update, allow users to set any
address of the form proto://address.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-23 02:20:46 +10:00
Aleksa Sarai
f88d701233 containerd: use docker/listeners to create the GRPC socket 
This allows for the use of socket activation with the flag `-l fd://`
and similar. The semantics are identical to Docker, but it's important
to note that the semantics of the --listen flag have changed to require
a proto://addr formatted string.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-23 02:20:46 +10:00