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

37 commits

Author SHA1 Message Date
Stephen J Day
baa307cd4b
cmd/containerd: remove cli.Context dependence for content.Store 
We've moved to using the config, directly. This removes the argument and
gets rid of a few extra lines of code.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-02-21 15:27:12 -08:00
Stephen J Day
e6efb397cf
cmd/dist: port commands over to use GRPC content store 
Following from the rest of the work in this branch, we now are porting
the dist command to work directly against the containerd content API.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-02-21 13:10:31 -08:00
Michael Crosby
f01434283c Merge pull request #553 from crosbymichael/config 
Add config file
 2017-02-21 11:52:08 -08:00
Michael Crosby
a9950aedcf Add config file 
This adds a config file for containerd configuration.  It is hard to
have structure data on cli flags and the config file should be used for
the majority of fields when configuring containerd.

There are still a few flags on the daemon that override config file
values but flags should take a back seat going forward and should be
kept at a minimum.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-21 11:22:08 -08:00
Qiang Huang
7206427df4 Fix interceptor handler parameter 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-02-21 08:41:31 -08:00
Qiang Huang
d42dfcba23 Delete default log-level value 
It's duplicate with --log-level, and since --log-level
takes advantage of --debug and it has default value,
--debug never works now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-02-18 21:14:58 +08:00
Michael Crosby
ab8586b7c5 Remove bundles from API 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-15 13:56:41 -08:00
Akihiro Suda
bf8abef70f api: introduce api/{types,services} for deduplication of API definition 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-14 02:42:13 +00:00
Michael Crosby
89f62d4fae Merge pull request #515 from fate-grand-order/branch 
Use errors.New() directly to output the error message
 2017-02-10 13:55:10 -08:00
Phil Estes
43e42b4222 Merge pull request #503 from jmzwcn/master 
Allow specifying the log level
 2017-02-10 12:35:14 -08:00
Daniel Zhang
ca52365780 Allow specifying the log level 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2017-02-10 17:29:06 +08:00
fate-grand-order
af86cd4d2f Use error.New () directly to output the error message 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-02-10 14:31:49 +08:00
Michael Crosby
42a17f9391 Merge pull request #501 from mlaventure/new-shim-continued 
New shim continued
 2017-02-07 15:52:08 -08:00
Kunal Kushwaha
1191b209ae closing http connection 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-02-07 14:57:44 +09:00
Kenfe-Mickael Laventure
78d7e8b256 supervisor: implement monitoring 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-06 15:16:55 -08:00
Kenfe-Mickael Laventure
6f9eda1134 api/execution: remove ProcessID from rpc calls 
Now that the shim handles all container's processes the system pid is
sufficient.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-02 15:36:10 -08:00
Michael Crosby
f187da9485 Port over supervisor to use grpc shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-01 16:01:53 -08:00
Kunal Kushwaha
6af4f5fee8 Exposing pprof and expvars interfaces on default containerd socket 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-02-01 11:05:55 +09:00
Ed King
89607a10db os.MkdirAll the containerd root dir 
Signed-off-by: Ed King <ed@teddyking.co.uk>
 2017-01-28 15:47:51 +00:00
Qiang Huang
7e4a7402f9 Add some logrus info for containerd 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-01-27 22:12:52 +08:00
Michael Crosby
c08e0e610c Add grpc service to shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-01-26 11:31:17 -08:00
Akihiro Suda
7fed38881d rootfs: fix compilation error 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-01-23 08:54:57 +00:00
Akihiro Suda
727f0a536e vendor: sirupsen/logrus -> Sirupsen/logrus 
github.com/docker/docker/pkg/archive requires Sirupsen/logrus.
So let's remove sirupsen/logrus at the moment.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-01-23 08:50:08 +00:00
Kenfe-Mickael Laventure
3f2d9d19bf execution: remove oci executor 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-19 07:57:02 -08:00
Kenfe-Mickael Laventure
5b40adf9af execution: add shim runtime 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-12 10:45:33 -08:00
Michael Crosby
4c848c4654 Merge pull request #382 from runcom/not-only-runc 
cmd/containerd: extend to other OCI runtimes
 2017-01-10 09:26:21 -08:00
Gábor Lipták
102fb10fde Correct vet warnings 
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
 2016-12-20 17:10:01 -05:00
Kenfe-Mickael Laventure
0fdd2469f6 execution: "restore" container on service creation 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-16 11:40:47 -08:00
Antonio Murdaca
98b39002ba
cmd/containerd: extend to other OCI runtimes 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-12-16 18:35:15 +01:00
Kenfe-Mickael Laventure
aa5ff88bbc Integrate NATS with event subsystem 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-12 14:54:47 -08:00
Kenfe-Mickael Laventure
2ef399b315 Add event support to execution subsystem 
The implementation relies on nats.io

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-12 09:21:29 -08:00
Kenfe-Mickael Laventure
5a86eae247 Merge execution and container service 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-07 19:44:22 -08:00
Michael Crosby
723a72bdf8 Fix execution build 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-12-05 16:18:05 -08:00
Michael Crosby
bde30191f4 Move service to execution package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-12-05 14:33:31 -08:00
Kenfe-Mickael Laventure
c857213b4c move work on execution service 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-05 14:15:03 -08:00
Michael Crosby
6641888667 Start work on execution server implementation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-12-02 11:33:58 -08:00
Stephen J Day
796b609741
cmd: move cli files to cmd package 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-12-01 12:07:45 -08:00
Renamed from cli/containerd/main.go (Browse further)