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

13124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Random-Liu
8c1f26747a Add unit test. 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-05-26 23:52:31 +00:00
Random-Liu
b112418e7b Finish image management. 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-05-26 23:52:31 +00:00
Derek McGowan
7fc91b0591 Merge pull request #898 from coolljt0725/stack 
Add SIGUSR1 to print the stack of containerd
 2017-05-26 16:26:50 -07:00
Michael Crosby
b2a3f39992 Merge pull request #922 from crosbymichael/report-m26 
Add dev report for May 26
 2017-05-26 16:22:11 -07:00
Michael Crosby
c72e29ae25 Merge pull request #780 from gianarb/feature/build-docs 
Added build doc
 2017-05-26 16:12:44 -07:00
Derek McGowan
4ac0e69575 Merge pull request #910 from crosbymichael/travis 
Add integration test support to travis.ci
 2017-05-26 16:02:05 -07:00
Michael Crosby
b3f891b09f Add integration tests for running containers 
Add travis support for running integration tests with the client package
and go test framework

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-26 15:50:01 -07:00
Michael Crosby
9ddaaff14a Add dev report for May 26 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-26 15:00:23 -07:00
Derek McGowan
c7317b2d00
Move push handler from dist to remotes 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-26 14:38:39 -07:00
Stephen Day
36f9605479 Merge pull request #911 from dmcgowan/pusher-dispatcher 
Add image push to dist tool
 2017-05-26 14:19:02 -07:00
Stephen Day
ed338d134d Merge pull request #915 from stevvooe/update-grpc 
vendor: update grpc dependencies
 2017-05-26 14:10:34 -07:00
Michael Crosby
975ed7906b Merge pull request #889 from crosbymichael/checkpoint-image 
Rename Image to CheckpointPath in shim
 2017-05-26 13:44:53 -07:00
Michael Crosby
ee90a77f63 Rename Image to CheckpointPath in shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-26 10:06:53 -07:00
Michael Crosby
9c8e3e38b2 Merge pull request #919 from coolljt0725/remove_epoll_arm64 
Remove C implementation of epoll on arm64
 2017-05-26 10:04:34 -07:00
Lei Jitang
435f03d237 Remove C implementation of epoll on arm64 
`"golang.org/x/sys/unix"` support epoll on arm64
with 324e137580
There is no need a C implementation of epoll on arm64.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2017-05-26 13:30:57 -04:00
Michael Crosby
3561d11840 Merge pull request #913 from stevvooe/namespaces 
api/services/namespaces: define the Namespaces service
 2017-05-26 09:35:02 -07:00
Michael Crosby
57a3788c87 Merge pull request #918 from miaoyq/del-redundant-waitExit 
delete the redundant func "waitExit"
 2017-05-26 09:33:56 -07:00
Gianluca Arbezzano
254a95caad
Added build doc 
This commit added a build chapter into the doc to explain how to compile
`containerd` binaries via Docker container.

I did that after a discussion on Slack. For some reason in my Ubuntu
16.10 I am not able to build containerd. It's probably some trick mess
that I created (I am super powerful on these things).o

But it can be useful for other people like me!

Signed-off-by: Gianluca Arbezzano <gianarb92@gmail.com>
 2017-05-26 10:56:44 +02:00
Yanqiang Miao
e4e80fb7b7 delete the redundant 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-05-26 16:55:49 +08:00
Stephen J Day
319b5c5ea2
api/services/namespaces: define the Namespaces service 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-25 17:39:41 -07:00
Stephen J Day
b626757d06
vendor: update grpc dependencies 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-25 17:20:23 -07:00
Derek McGowan
73c8847b47
Add image push to dist tool 
Implements image push with progress tracking.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-25 16:43:07 -07:00
Derek McGowan
199544ea80 Merge pull request #904 from crosbymichael/client 
Add initial containerd client package
 2017-05-25 16:21:57 -07:00