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

46 commits

Author SHA1 Message Date
Stephen J Day
935144fadd
version: finish version setup 
This setup will now correctly set the version number from the git tag.
When using `--version`, we will see the binary name, the package it was
built from and a git hash based on the tag:

```console
$./bin/dist -v
./bin/dist github.com/docker/containerd 0b45d91.m
```

Note that in the above example, if we set a tag of `v1.0.0-dev`, that
will show up in the version number, as follows:

```console
$./bin/dist -v
./bin/dist github.com/docker/containerd v1.0.0-dev
```

Once commits are made past that tag, the version number will be
expressed relative to that tag and include a git hash:

```console
$./bin/dist -v
./bin/dist github.com/docker/containerd v1.0.0-dev-1-g7953e96.m
```

Some these examples include a `.m` postfix. This indicates that the
binary was build from a source tree with local modifications.

We can add a dev tag to start getting 1.0 version numbers for test
builds.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-02-22 13:16:06 -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
f83652dbf1 Ensure to read all io in error cases 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-02-21 08:46:04 -08:00
Akihiro Suda
5f6f04742c ctr: add --runtime-config 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-21 05:04:18 +00:00
Akihiro Suda
2836fbeed1 ctr: fix Sprintf 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-20 05:28:09 +00:00
Michael Crosby
47ececd6b8 Change Container interface to include Info 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-16 09:59:40 -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
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
Kunal Kushwaha
a9ea9d80a3 ctr pprof support added 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-02-10 11:16:40 +09:00
Kenfe-Mickael Laventure
b4a299e61d supervisor/shim: add exec support 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-07 09:25:55 -08: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
31f26fed18 Move to a single Event type 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-06 08:46:37 -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
Kenfe-Mickael Laventure
40b0b211b7 api/execution: add Container suffix to relevant rpc calls 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-02 14:40:23 -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
Kenfe-Mickaël Laventure
24c2810899 Merge pull request #462 from crosbymichael/shim 
shim: GRPC service
 2017-01-26 16:11:45 -08:00
Michael Crosby
f70d485d72 Merge pull request #468 from jzwlqx/master 
optimal help info for ctr cli.
 2017-01-26 15:34:31 -08:00
Michael Crosby
f431bf4ad4 Add state rpc to shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-01-26 15:09:59 -08:00
Michael Crosby
b59bd59d8a Working tty and io support in shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-01-26 11:31:17 -08:00
Michael Crosby
07c81ccac4 Add events api to shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-01-26 11:31:17 -08:00
Michael Crosby
e09b0b0c35 Add exec functionality to shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-01-26 11:31:17 -08:00
Michael Crosby
bf036b9d78 Add ctr shim command 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-01-26 11:31:17 -08:00
Kenfe-Mickaël Laventure
b5ee0b1bd4 Merge pull request #451 from AkihiroSuda/trivial-cleanup 
*: clean up
 2017-01-25 11:02:38 -08:00
Jizhong Jiang
f5615b0225 optimal help info for ctr cli. 
Signed-off-by: Jizhong Jiang <jiangjizhong@gmail.com>
 2017-01-25 14:16:13 +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
Akihiro Suda
e9bfed4cf2 *: clean up 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-01-20 01:50:08 +00:00
Akihiro Suda
8bd1b0d2e4 ctr: add commands: list and inspect 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-01-18 02:47:42 +00:00
Qiang Huang
9a5b17009c Fix io closer 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-01-17 19:04:20 +08:00
Kenfe-Mickael Laventure
a60487b782 ctr: set raw mode when using --tty 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-12 11:39:09 -08:00
Kenfe-Mickael Laventure
3234546ee6 ctr: take console flag in account when readying IOs 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-12 10:24:22 -08:00
Kenfe-Mickael Laventure
8e603d2e48 ctr: use full path for bundle in run 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-12 10:23:29 -08:00
Kenfe-Mickael Laventure
f9aac9d599 ctr: add delete command 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-12 10:15:27 -08: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
Kenfe-Mickael Laventure
13399c1330 ctr: add events command 
This simply print all events generated by containerd

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-16 08:49:09 -08: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
2bee4ac5cd Only use IDs for execution RPC requests 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-09 11:32:45 -08:00
Kenfe-Mickael Laventure
0aad42f5cf Add exec and terminal support 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-09 10:00:34 -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
Kenfe-Mickael Laventure
ac3cc32dbc Complete basic support for ctr run 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-12-07 19:44:22 -08:00
Michael Crosby
df9c09303c Fix ctr build 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-12-05 16:36:15 -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