dilim/containerd
1
0 Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-11-07 22:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
720 Commits 33 Branches 333 Tags
2fa44da736ca97eabbc5967367a6dade83c59487
Commit Graph
122 Commits
Author SHA1 Message Date
Kenfe-Mickael Laventure 6fcde8a573 Update runtime-spec to v1.0.0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-03 07:30:49 -07:00
Derek McGowan 20c8b7e2c1 Update logrus to v1.0.1 
Fix case-sensitivity issue in containerd files

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-26 11:24:10 -07:00
Antonio Murdaca 2a2e00610c allow update RT CPU resources 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-06-21 10:55:19 +02:00
Antonio Murdaca b812857db2 supervisor: cancel SendTask when channel is full 
This patch handles case c) in https://github.com/moby/moby/issues/31487

(c) A request cannot be added to 's.tasks' because the queue is full.

case b) isn't fixable at this point case there's no way to cancel stuff
from a channel since channels aren't context aware (yet?).
Parallelizing tasks handling isn't easily doable either.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-06-05 19:27:02 +02:00
Michael Crosby 740005a298 Update containerd for runc rc5 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-27 13:22:10 -07:00
Sunny 91525bfcae api.proto: Add pidsLimit 
pidsLimit is required to enable updating PidsLimit of containers.
Also, updated runtime Resources, UpdateResources and ctr with pidsLimit.

Signed-off-by: Sunny Gogoi <indiasuny000@gmail.com>
 2017-04-13 21:16:44 +00:00
Kenfe-Mickael Laventure 793b73880e Update import path to use containerd/containerd instead of docker/docker 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-13 11:58:06 -07:00
Kenfe-Mickael Laventure aff808ece6 Update protobuf and grpc to match docker/swarmkit 
protobuf: 8ee79997227bf9b34611aee7946ae64735e6fd93
grpc: v1.0.4

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-23 15:27:12 -08:00
Wang Long 2dfb24bbea api: fix pprof-address usage 
Adding the following line will install handlers under the /debug/pprof/ URL to download live profiles:

```
import _ "net/http/pprof"
```

see: https://golang.org/pkg/net/http/pprof/
     https://golang.org/pkg/runtime/pprof/

Signed-off-by: Wang Long <long.wanglong@huawei.com>
 2016-11-05 09:49:39 +00:00
Kenfe-Mickael Laventure 034682e4db Honor context termination on Start and Exec 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-31 10:12:25 -07:00
Amit Krishnan 897874e76d Add support for containerd,containerd-shim and ctr for Solaris. This adds support for ctr containers list,start,stop,kill via a Solaris specific oci compliant runtime. 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-10-17 14:43:57 -07:00
Michael Crosby 8e90cd623a Merge pull request #329 from runcom/expose-real-pids 
api.proto: expose real pids when adding processes
 2016-10-17 09:19:14 -07:00
Antonio Murdaca 35f313d114 api.proto: expose real pids when adding processes 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-15 01:23:24 +02:00
Vladimir Rutsky 9875baedc8 fix typo: "Workind" 
Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
 2016-10-10 00:30:54 +03:00
Mike Danese 3492af35ba grpc: regenerate protos and adjust for new package API 
Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-09-12 11:37:24 -07:00
Yu, Zou 79c7673858 add more blkio subsystem parameters to control according to ones provided by runc. (#304) 
Signed-off-by: Yu Zou <zouyu7@huawei.com>
 2016-08-26 11:07:45 -07:00
Harry Zhang 9df37c23e4 Fix wrong field name 
Signed-off-by: Harry Zhang <harryz@hyper.sh>
 2016-07-14 17:06:01 +08:00
Kenfe-Mickaël Laventure 90f827ca10 Streamline events (#287) 
* Sync process.State() with the matching events

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Allow requesting events for a specific container

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Sync container state retrieval with other events

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Let containerd take care of calling runtime delete on exit

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Take care of possible race in TestBusyboxTopExecTopKillInit

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-13 11:01:07 -07:00
Kenfe-Mickael Laventure dfb626dccc Use protobuf Timestamp type instead of uint64 
This will ensure nanoseconds are taken in account.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-01 09:37:21 -07:00
Kenfe-Mickaël Laventure 098f9f1a1b Use uin64 for UpdateResource rpc (#265) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-13 10:59:12 -07:00
boucher a135e1093d Support the new --empty-ns flags in RunC for checkpoint/restore. 
Signed-off-by: Ross Boucher <rboucher@gmail.com>
 2016-06-09 16:49:26 -04:00
Kenfe-Mickaël Laventure 16a8dfe6a8 Add support for updating Kernel Memory Limits (#256) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-06 11:26:07 -07:00
Kenfe-Mickaël Laventure 5624732128 Add golint to test (#255) 
* Add a new lint rule to the Makefile

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Fix linter errors

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Allow replacing the default apt mirror

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-03 15:00:49 -07:00
Michael Crosby 7fa8fc1477 Regen proto for checkpoint pr (#249) 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-25 17:52:46 -07:00
Ross Boucher e756ae42d1 Add support for specifying a checkpoint directory. (#245) 
Signed-off-by: Ross Boucher <rboucher@gmail.com>
 2016-05-25 17:42:37 -07:00
Kenfe-Mickaël Laventure 126e5c403e Allow specifying runtime to be used when creating container (#247) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-05-23 15:43:47 -07:00
Amit Krishnan 62e1370f91 containerd build clean on Solaris (#203) 
* containerd build clean on Solaris

Signed-off-by: Amit Krishnan <krish.amit@gmail.com>

* Vendor golang.org/x/sys

Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-05-19 10:12:50 -07:00
Michael Crosby 614df93b92 Update grpc and protobufs dep (#243) 
* Update grpc and protobufs dep

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Fix grpc error check

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-18 09:16:55 -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
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
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 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 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 7a1d28e42b Bump runc and runtime-specs deps 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-26 13:38:36 -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
Michael Crosby 63001ee20d Merge pull request #185 from LK4D4/fix_pprof_address 
api: fix pprof-address usage
 2016-04-18 11:01:31 -07:00
Alexander Morozov 9416996835 api: fix pprof-address usage 
those handlers already added by init functions

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-04-05 11:36:51 -07:00
Aleksa Sarai 696cb97c28 api: grpc: add Limit to PidsStats 
This will be filled by the value of pids.max, allowing clients to render
usage statistics for PIDs in a container.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-05 01:47:32 +10:00
Michael Crosby 47f239706c Add no pivot root support 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-30 21:52:15 -07:00
Michael Crosby 3d72dc1e4e Merge pull request #161 from calavera/enable_pprof 
Enable http pprof connections when pprof-address flag is set
 2016-03-25 17:27:08 -07:00
David Calavera 06bcd7d03c Enable http pprof connections when pprof-address is set. 
Add flag to specify the address where those connections listen.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-25 17:46:10 -04:00
Kenfe-Mickael Laventure bac78851e0 Append error message to internal errors 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Ben Firshman 9979502ca8 Fix spacing in api.proto 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-03-18 17:37:59 -07:00
Michael Crosby a4844a68a6 Add exec rlimit support to containerd 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-15 11:46:47 -07:00
Michael Crosby e637c1ea80 Update specs imports for specs-go 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-15 11:31:32 -07:00
Tonis Tiigi ab5eae56bf Add pids stats 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-08 16:13:10 -08:00
Michael Crosby 0dd075a47b Add update rpc for resource updates 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-07 15:23:52 -08:00