Commit Graph

11956 Commits

Author SHA1 Message Date
Mike Brown
031b284c8a Squashed 'hack/repro-infra/' content from commit 684e550
git-subtree-dir: hack/repro-infra
git-subtree-split: 684e550a2f006dbe3cf3b3d481d3f19217b228f7
2017-04-21 11:39:29 -05:00
heartlock
8af8fd07d5 enable travis CI
Signed-off-by: heartlock <21521209@zju.edu.cn>
2017-04-20 22:26:27 -09:00
Qiang Huang
455a185d98 Merge pull request #740 from crosbymichael/oom-event
Emit oom events
2017-04-20 17:23:24 -05:00
Qiang Huang
a9601d1df9 Merge pull request #746 from sak0/dev
Correct the usage of containerd --config
2017-04-20 16:56:46 -05:00
Kevin Swiber
b365fbecfd Ensure proper types for arguments to time.Unix.
When compiling for armv7, the type is `int32` for `Timespec.Sec` and
`Timespec.Nsec` in the syscall package. When passing these values
to `time.Unix`, the values must be converted to `int64`.

Signed-off-by: Kevin Swiber <kswiber@gmail.com>
2017-04-20 12:55:06 -07:00
Michael Crosby
714ffdb51a Merge pull request #756 from lilyfang/patch-1
Update dockercon-summit.md
2017-04-20 11:07:12 -07:00
Li Li
6ae973362a Update dockercon-summit.md 2017-04-20 01:31:00 -05:00
Phil Estes
a12b20ebc4 Merge pull request #748 from miaoyq/del-tmpdir
Delete the temporary diractory at the end of the function "ApplyLayer"
2017-04-20 00:10:35 -05:00
Yanqiang Miao
df8ece5a41 Avoid creating snapshots repeatedly
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-20 12:59:33 +08:00
Stephen Day
3d076e5c33 Merge pull request #747 from miaoyq/rm-redundant-type-conversion
Remove the redundant type conversion
2017-04-19 15:19:24 -05:00
Derek McGowan
aee5b75cd8 Merge pull request #742 from xiekeyang/tmpdir
remove temporary dir
2017-04-19 13:26:50 -05:00
Derek McGowan
0f035c712f Merge pull request #750 from stevvooe/fix-dist-apply-help
cmd/dist: correct `dist apply` help
2017-04-19 13:24:28 -05:00
Stephen J Day
6eac7c159e
cmd/dist: correct dist apply help
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-19 12:57:28 -05:00
Phil Estes
ae502e8c2a Merge pull request #749 from boucher/patch-1
Checkpoint/Restore proposal
2017-04-19 10:06:18 -05:00
Ross Boucher
9999e85f80 Checkpoint/Restore proposal 2017-04-19 08:57:10 -05:00
Mike Brown
11ba1cb54d initial makefile (#7)
* adds initial makefile

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* clean up lint

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* presume path is set to contain gomealinter

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* addresses requested improvements

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-04-18 21:17:14 -05:00
Yanqiang Miao
c5c6f36e83 Delete the temporary diractory at the end of the function
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-19 09:52:44 +08:00
Yanqiang Miao
d95e98d049 Remove the redundant type conversion
The type of ocispec.Descriptor.Digest is digest.Digest now,
so the type conversion is redundant.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-18 16:55:19 +08:00
CuiHaozhi
d51976b60a Correct the usage of containerd --config
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
2017-04-17 06:44:18 -04:00
Kunal Kushwaha
18bcec512e dist subcommands reorganized.
few dist commands reorganized into subcommands "image" and "content".
Fix for #689

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-04-17 13:58:37 +09:00
Lantao Liu
b5734373c4 Merge pull request #2 from Random-Liu/add-initial-code
Add initial code
2017-04-14 19:05:05 -07:00
Random-Liu
022b25259e Update godep 2017-04-14 19:04:27 -07:00
Random-Liu
f2925f58ac Add initial code framework 2017-04-14 19:04:26 -07:00
Lantao Liu
2ec9bfc6ae Merge pull request #1 from Random-Liu/initial-document
Add initial documents.
2017-04-14 15:09:26 -07:00
Random-Liu
e51409a9cf Add initial documents. 2017-04-14 15:08:49 -07:00
Stephen Day
bbeaab5ee3 Merge pull request #739 from crosbymichael/exitedat
Add exited at to events and delete requests
2017-04-14 13:10:53 -07:00
Michael Crosby
5d3bc1a4a7 windows process exit timestamp
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-14 11:22:07 -07:00
Stephen Day
2369f498f2 Merge pull request #741 from xiekeyang/coverage
ignore coverage.out for git submit
2017-04-14 09:00:18 -07:00
xiekeyang
e78e921fc1 remove temporary dir
The temporary directory had better to be removed after test case
finished.

Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2017-04-14 12:05:37 +08:00
xiekeyang
fac24f67c7 ignore coverage.out for git submit
coverage.out should be ignored when git submitting as well.

Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2017-04-14 10:58:33 +08:00
sarahnovotny
b4d0dc444d Initial commit 2017-04-13 15:20:25 -07: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
e745efdddb Bump cgroups pkg to e950a27f3faf567abbf995bfbec90
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-13 14:24:59 -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
d41f146eed Merge pull request #737 from fabiokung/summit-disk-quotas
containerd summit: suggest a discussion about disk quotas
2017-04-13 11:32:36 -07:00
Fabio Kung
f401bec0fd containerd summit: suggest a discussion about disk quotas
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
2017-04-13 11:19:55 -07:00
Michael Crosby
7389500a2f Merge pull request #732 from coolljt0725/update_cli
update `urfave/cli` to 8ba6f23b6e36d03666a14bd9421f5e3efcb59aca
2017-04-13 11:01:22 -07:00
Phil Estes
07b5bca43c Merge pull request #735 from crosbymichael/socket-unpack
Only set socket on non-nil type creation
2017-04-13 13:58:12 -04:00
Phil Estes
b369a6bff3 Merge pull request #721 from kunalkushwaha/bugfix-664
Correct the description of `dist get`.
2017-04-13 13:30:18 -04: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
Lei Jitang
33dca67daf update urfave/cli to 8ba6f23b6e36d03666a14bd9421f5e3efcb59aca
relate to https://github.com/containerd/containerd/pull/723

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-04-13 07:59:32 -04:00
Phil Estes
4a749ad473 Merge pull request #725 from vbatts/make-install
Makefile: fix `sudo make install`
2017-04-12 15:42:17 -04:00
Phil Estes
2565202183 Merge pull request #724 from crosbymichael/oom-score
Set oom score for containerd and shims
2017-04-12 15:41:23 -04:00
Vincent Batts
ac28fee304
Makefile: fix sudo make install
When there isn't a `go` outside of the user's PATH

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-04-12 14:47:38 -04:00
Michael Crosby
caa1de319e Merge pull request #713 from mlaventure/windows-runtime
Windows Pty and CloseStdin
2017-04-12 11:36:54 -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
Qiang Huang
8d5f8de8ba Merge pull request #716 from justincormack/runtime-config
Add back the runtime-config flag in ctr run
2017-04-12 10:35:15 +08:00
Kunal Kushwaha
57e190907f Correct the discription of dist get.
BugFix #664

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-04-12 10:47:54 +09:00
Qiang Huang
f108e08703 Merge pull request #715 from justincormack/runc-vendor-up
Update the opencontainers/runc vendor
2017-04-12 09:18:05 +08:00
Kenfe-Mickael Laventure
918a3ee4a1 Implement Pty and CloseStdin for windows runtime
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-04-11 07:30:59 -07:00