github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,497 Commits 3 Branches 2 Tags 112 MiB
32f6e6c8aa
Commit Graph

11497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lantao Liu
dee95bc315 Add unit test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 01:18:22 +00:00
Lantao Liu
80c973a550 Ensure container rootfs and apply image config 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 01:18:22 +00:00
Lantao Liu
98bc3edf50 Merge pull request #48 from Random-Liu/apply-sandbox-image-config 
Apply sandbox image config
 2017-05-30 18:16:59 -07:00
Lantao Liu
6eb1ddb1f8 Add unit test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 00:39:38 +00:00
Lantao Liu
eb20601c08 Pull sandbox image and apply image config 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-31 00:39:38 +00:00
Derek McGowan
b1a45c2aee
Fix windows build for client 
Move io copy logic from ctr utils to io_windows.go.
Fix compilation errors on Windows.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-30 16:57:34 -07:00
Michael Crosby
5e82767d9d Merge pull request #923 from dmcgowan/push-refactor-handler 
Move push handler from dist to remotes
 2017-05-30 12:54:57 -07:00
Derek McGowan
a7a764adfa Merge pull request #926 from stevvooe/merge-metadata-storage 
metadata: merge storage into package
 2017-05-30 12:26:44 -07:00
Kenfe-Mickaël Laventure
0e56c47f8c Merge pull request #928 from AkihiroSuda/oci-rc6 
vendor: OCI Image Spec v1.0.0-rc6
 2017-05-30 10:09:28 -07:00
Michael Crosby
f55f40eeec Merge pull request #927 from miaoyq/fix-description-for-pprof 
Fix the description of cmd 'pprof threadcreate'
 2017-05-30 09:13:57 -07:00
Michael Crosby
1ee2e14a47 Merge pull request #931 from AkihiroSuda/ctr-shim-flag-fix 
ctr shim exec: fix cli flag
 2017-05-30 09:13:32 -07:00
Akihiro Suda
967a4e0e5a ctr shim exec: fix cli flag 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-27 14:54:38 +00:00
Akihiro Suda
f9039092c5 vendor: OCI Image Spec v1.0.0-rc6 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-27 12:27:14 +00:00
Yanqiang Miao
5c32d3871f Fix the description of cmd 'pprof threadcreate' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-05-27 13:42:16 +08:00
Lantao Liu
60e28a9460 Minor cleanup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-27 00:31:30 +00:00
Lantao Liu
a49f66e0bb Merge pull request #46 from Random-Liu/wait-image-pulling 
Wait and check image pulling progress.
 2017-05-26 17:24:47 -07:00
Stephen J Day
7c14cbc091
metadata: merge storage into package 
The implementations for the storage of metadata have been merged into a
single metadata package where they can share storage primitives and
techniques. The is a requisite for the addition of namespaces, which
will require a coordinated layout for records to be organized by
namespace.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-26 17:16:13 -07:00
Random-Liu
c3ac5f7533 Add image pull waiting. 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-05-27 00:12:00 +00:00
Random-Liu
bc7dfa2650 Update containerd version to 193abed96e. 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-05-27 00:07:48 +00:00
Lantao Liu
bdc443a77c Merge pull request #41 from Random-Liu/finish-image-management 
Finish image management.
 2017-05-26 17:04:41 -07:00