github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
5,531 Commits 3 Branches 2 Tags 112 MiB
12cb1554be
Commit Graph

5531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Kenfe-Mickael Laventure
22a051c88e Refactor windows runtime 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-11 07:30:59 -07:00
Justin Cormack
2d8c735aa6 Add back the runtime-config flag in ctr run 
This flag was already implemented but could not be specified any more.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-11 11:56:41 +01:00
Justin Cormack
5e3c399d48 Update the opencontainers/runc vendor 
This fixes the ugly build errors on Alpine Linux which the old version gave
from C type mismatches, and now gives a nice neat line of whales on build...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-04-11 11:07:07 +01:00
Kenfe-Mickael Laventure
15eddd0ce2 Fix CI for windows 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-10 14:38:12 -07:00
Phil Estes
62918511f3 Merge pull request #712 from crosbymichael/sysunix 
Replace syscall with /x/sys/unix in execution code
 2017-04-10 16:30:32 -04:00
Michael Crosby
9e1acba19f Update deps with sys/unix changes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-10 13:07:41 -07:00
Derek McGowan
a17c10540d Merge pull request #711 from vbatts/config-subcommand 
containerd: make a config subcommand
 2017-04-10 13:03:10 -07:00
Michael Crosby
3db1ea8d07 [bin] Replace syscall with /x/sys/unix 
Replace syscall usage with /sys/unix in the binaries and their packages

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-10 12:01:33 -07:00
Michael Crosby
4f7d521510 [exec] Replace syscall with /x/sys/unix 
This replaces the syscall usage with sys/unix in the execution code

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-10 11:56:33 -07:00
Vincent Batts
f58f047b7f
containerd: revert the auto config creation 
rather than automagically doing this, it is the user's responsibility to
review the output of `containerd config default` and create the config
themselves.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-10 14:54:36 -04:00
Phil Estes
4f33aa2b5c Merge pull request #702 from crosbymichael/attach 
Expose Pty resize and CloseStdin RPCs
 2017-04-10 14:38:30 -04:00
Vincent Batts
741c471753
containerd: make a config subcommand 
For the purpose of reviewing the default config

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-04-10 14:33:29 -04:00
Michael Crosby
bb9f908cdf Merge pull request #710 from mlaventure/fix-dist-socket-arg 
Fix dist socket parameter
 2017-04-10 10:20:17 -07:00
Kenfe-Mickael Laventure
ab9c4c31d6 Fix dist socket parameter 
It was renamed to address.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-10 09:37:43 -07:00
Kenfe-Mickaël Laventure
49e3c116ef Merge pull request #705 from crosbymichael/shim-dead 
Handle restore with dead shim
 2017-04-07 14:42:07 -07:00
Michael Crosby
7482962b9d Handle restore with dead shim 
Add functionality for restoring containers after containerd dies and is
restarted with terminated shims.

This ensures that on restore, if a container no longer has a running
shim, containerd will kill and cleanup the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-07 14:22:43 -07:00
Stephen Day
87f8f8c94b Merge pull request #704 from stevvooe/simplify-image-service 
services/images: simplify transaction management
 2017-04-07 11:20:17 -07:00
Michael Crosby
a7da08b7ba Add Pty and CloseStdin RPCs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-07 11:20:10 -07:00
Stephen Day
c1325a5aa9 Merge pull request #700 from mlaventure/rebased-windows 
Initial windows runtime work
 2017-04-07 11:15:45 -07:00
Kenfe-Mickael Laventure
c5843b7615 Initial windows runtime work 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-04-07 09:20:44 -07:00
Stephen J Day
23a9dd601c
services/images: simplify transaction management 
For some reason, when I wrote this, I forgot about the `View` and
`Update` helpers on boltdb. These are now used and makes the code much
easier to follow.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-04-06 17:58:33 -07:00
Phil Estes
e5c8c5634a Merge pull request #696 from crosbymichael/exec 
execution: add exec for additional processes
 2017-04-06 13:53:46 -04:00
Michael Crosby
47225c130c Add ctr exec 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-04-06 10:36:47 -07:00
Qiang Huang
0a484cc5dc Merge pull request #698 from dmcgowan/snapshot-mkdir-exist 
Update snapshot mkdir to check for directory exist
 2017-04-06 17:08:22 +08:00
Derek McGowan
63f01733b0
Update snapshot mkdir to check for directory exist 
When starting up a snapshot driver on subsequent runs, the
mkdir call will return an exist error, this can be safely
ignored.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-04-05 17:04:44 -07:00