github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,017 Commits 3 Branches 2 Tags 112 MiB
f8538b5e12
Commit Graph

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen J Day
f8fe5605dd
cmd/dist: better organization and aliases for image command 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-05 13:41:04 -07:00
Stephen Day
f105db9626 Merge pull request #933 from kunalkushwaha/timestamp 
Timestamp added to container object.
 2017-06-05 12:00:33 -07:00
Michael Crosby
bf2fee2da1 Merge pull request #909 from vburenin/diff-plugin 
Make Diff/Apply plugable
 2017-06-05 11:04:34 -07:00
Phil Estes
71575bf413 Merge pull request #948 from crosbymichael/client-tty 
Add client terminal support for IO
 2017-06-05 09:41:11 -04:00
Kunal Kushwaha
0008ac7f3d Timestamp added to container object. 
Fix for #912

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-06-05 14:30:49 +09:00
Lantao Liu
42131acc68 Merge pull request #56 from Random-Liu/add-container-logging 
Add container logging support.
 2017-06-02 10:11:41 -07:00
Michael Crosby
4ae34cccc5 Merge pull request #951 from WeiZhang555/typo 
Fix typo
 2017-06-02 09:41:13 -07:00
Lantao Liu
69fcf97583 Add unit test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-02 16:36:02 +00:00
Lantao Liu
e657e1eb14 Add container logging support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-02 16:36:02 +00:00
Lantao Liu
264619a858 Merge pull request #64 from Random-Liu/cleanup-code 
Cleanup code.
 2017-06-02 09:18:47 -07:00
Zhang Wei
4a23bb9761 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-06-02 16:09:37 +08:00
Lantao Liu
95e0fc694f Cleanup some code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-02 02:15:58 +00:00
Stephen Day
12c596be29 Merge pull request #949 from stevvooe/continue-on-error 
cmd/dist: don't display undeleted images
 2017-06-01 17:58:38 -07:00
Stephen Day
305c04154e Merge pull request #950 from stevvooe/remote-path-manip 
cmd/dist: remove unnecessary path manipulation
 2017-06-01 17:58:13 -07:00
Stephen J Day
06c2d85e46
cmd/dist: remove unnecessary path manipulation 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-01 16:56:14 -07:00
Stephen J Day
640493adbf
cmd/dist: don't display undeleted images 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-01 16:53:55 -07:00
Volodymyr Burenin
3c76a667b6 Make Diff/Apply plugable 
Signed-off-by: Volodymyr Burenin <vburenin@gmail.com>
 2017-06-01 18:38:33 -05:00
Michael Crosby
35d74aa9d8 Merge pull request #803 from yuexiao-wang/fix-background 
optimize for shim
 2017-06-01 15:12:04 -07:00
Michael Crosby
887a149417 Add terminal support 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-01 14:46:14 -07:00
Michael Crosby
e022cf3ad0 Add Resize pty support to client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-01 14:32:19 -07:00
Phil Estes
7071276f64 Merge pull request #943 from mlaventure/honor-runtime-conf 
Use conf value when killing loaded container
 2017-06-01 17:12:17 -04:00
Michael Crosby
00734ab04a Return fifo paths from Shim 
This allows attach of existing fifos to be done without any information
stored on the client side.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-01 14:12:02 -07:00
Michael Crosby
43fb19e01c Add Load for container and Task with Attach 
This adds both container and task loading of running tasks as well as
reattaching to the IO of the task after load.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-01 14:12:02 -07:00
Michael Crosby
1db752bca8 Add CloseStdin to exec Process 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-01 14:10:04 -07:00
Michael Crosby
9890bed1e1 Add CloseStdin to task 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-01 14:10:04 -07:00
Stephen Day
6aeeefe2b2 Merge pull request #937 from dmcgowan/client-push 
Add push to client
 2017-06-01 14:03:55 -07:00
Phil Estes
85d568e19f Merge pull request #885 from dmcgowan/remote-create-writer-pre-fetch 
Avoid fetch call to registry when blob already exists
 2017-06-01 13:44:08 -04:00
Michael Crosby
6ff220a116 Merge pull request #939 from ijc25/reconnect-shim-event-stream 
Reconnect to shim event stream after containerd restart
 2017-06-01 09:52:13 -07:00
Lantao Liu
a4e067cdff Merge pull request #53 from Random-Liu/add-other-small-functions 
Add other small functions
 2017-05-31 14:54:42 -07:00
Lantao Liu
61cee6cf12 Merge pull request #59 from Random-Liu/backoff-when-lose-containerd-connection 
Retry and backoff when lost connection with containerd.
 2017-05-31 14:53:02 -07:00
Kenfe-Mickael Laventure
357c47b1a3 Use conf value when killing loaded container 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-31 14:51:28 -07:00
Lantao Liu
0179d0fbaf Retry and backoff when lost connection with containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 21:33:52 +00:00
Kenfe-Mickaël Laventure
47430d8909 Merge pull request #942 from dmcgowan/travis-make-build 
Travis make build
 2017-05-31 14:10:50 -07:00
Derek McGowan
91f084c6ac Merge pull request #941 from crosbymichael/client-processes 
Add Processes() to client
 2017-05-31 13:57:38 -07:00
Derek McGowan
dfce91854e
Update travis to run make build 
Ensure all packages can be built, even those not yet imported by binaries.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-31 13:35:03 -07:00
Derek McGowan
a4b2e580f2
Update continuity 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-31 13:35:03 -07:00
Michael Crosby
ff54c88e99 Add Processes() to client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-31 13:34:38 -07:00
Derek McGowan
126aa07ad2
Push client support 
Update dist tool to use client package

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-31 13:07:53 -07:00
Lantao Liu
2df96e1654 Add unit test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 19:11:56 +00:00
Lantao Liu
7c1a4c1fc1 Add Version, UpdateRuntimeConfig and Status. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 19:11:56 +00:00
Stephen Day
8ec5c30d83 Merge pull request #940 from crosbymichael/client-exec 
Add exec support to client
 2017-05-31 11:59:53 -07:00
Kenfe-Mickaël Laventure
95446e8f43 Merge pull request #938 from dmcgowan/client-windows-compile 
Fix windows build for client
 2017-05-31 11:58:36 -07:00
Michael Crosby
ebf935d990 Add exec support to client 
This also fixes a deadlock in the shim's reaper where execs would lockup
and/or miss a quick exiting exec process's exit status.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-31 11:50:23 -07:00
Lantao Liu
bc5dfdae24 Update containerd to 2562aca1a3 and add gomock. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 17:13:56 +00:00
Ian Campbell
a5d246404c Reconnect to shim event stream after containerd restart 
There are three aspects which need to be covered:

 - the runtime needs to restart its event pump when it reconnects (in
   loadContainer).
 - on the server side shim needs to monitor the stream context so it knows when
   the connection goes away.
 - if the shim's stream.Send() fails (because the stream died between taking
   the event off the channel and calling stream.Send()) then to avoid losing
   that event the shim should remember it and send it out first on the next
   stream.

The shim's event production machinery only handles producing a single event
stream, so add an interlock to ensure there is only one reader of the
`s.events` channel at a time. Subsequent attempts to use Events will block
until the existing owner is done.

Fixes #921.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-31 13:48:44 +01:00
yuexiao-wang
41308ffa57 optimize for shimCreateCommand 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-05-31 13:57:36 +08:00
Lantao Liu
6e27320f40 Merge pull request #57 from Random-Liu/remove-golang-1.7 
Remove golang 1.7 from ci.
 2017-05-30 18:57:16 -07:00
Lantao Liu
80f457c199 Merge pull request #52 from Random-Liu/apply-container-image-config 
Apply container image config
 2017-05-30 18:34:14 -07:00
Lantao Liu
eb5f378dd4 Remove golang 1.7 from ci. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 01:28:09 +00:00
Lantao Liu
80384fc24f Start container event monitor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 01:18:22 +00:00