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
Michael Crosby
cebe099358 Add test flag for setting containerd address 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-25 15:41:10 -07:00
Stephen Day
26183b3a69 Merge pull request #908 from ehazlett/fix-task-info 
Updates the execution service to include ContainerID in tasks
 2017-05-25 11:40:16 -07:00
Michael Crosby
89037568d3 Add windows spec generation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-25 11:30:16 -07:00
Michael Crosby
d0b22290ec Don't require rootfs if not set on container 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-25 11:17:36 -07:00
Michael Crosby
a2b0824720 Export GRPC services from client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-25 11:10:34 -07:00
Michael Crosby
608e6daaa4 Make Task, Container, Image interface types 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-25 11:05:58 -07:00
Michael Crosby
1de25c09e3 Add pause resume to task 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-25 10:15:35 -07:00
Evan Hazlett
f42c762dc4
updates the execution service to include ContainerID in tasks 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-25 12:15:00 -04:00
Michael Crosby
e2db2892ec Unexport client fields 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 16:26:35 -07:00
Michael Crosby
8cd882c570 Add test -short for non-integration tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 16:13:54 -07:00
Michael Crosby
5157a326fd Merge pull request #902 from ehazlett/ctr-env 
ctr: enable specifying additional environment variables
 2017-05-24 16:06:21 -07:00
Michael Crosby
01c4c86414 Add WithNamespace for client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 15:58:48 -07:00
Michael Crosby
bf9ad0c57f Fix spec generation for task execution 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 15:40:40 -07:00
Evan Hazlett
02fa534d71 ctr: enable specifying additional environment variables 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-24 18:24:31 -04:00
Michael Crosby
923236004a Add pull support to client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 14:08:58 -07:00
Michael Crosby
3ba06e48ed Add NewTask support to client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 14:08:58 -07:00
Michael Crosby
31a3bda41b Add NewContainer and Delete container support 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 14:08:58 -07:00
Michael Crosby
d0e5732f0b Add initial containerd *Client 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-24 14:08:58 -07:00
Stephen Day
17033dcaf2 Merge pull request #886 from dmcgowan/pusher 
Add push object
 2017-05-24 13:50:02 -07:00
Michael Crosby
ea9f1dcb70 Merge pull request #901 from justincormack/travis-darwin 
Add Darwin build support in Travis
 2017-05-24 10:21:39 -07:00
Justin Cormack
68eb405c3e Add Darwin build support in Travis 
fix #866

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-24 18:03:43 +01:00
Lei Jitang
37aa66484c Add SIGUSR1 to print the stack of containerd 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2017-05-24 13:02:09 -04:00
Kenfe-Mickaël Laventure
2911d342f4 Merge pull request #900 from justincormack/console-up 
Update go-runc and console
 2017-05-24 09:49:29 -07:00
Justin Cormack
a413d3ed0d Update go-runc and console 
This removes need for cgo in both of these, and updates licenses.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-05-24 17:38:24 +01:00
Michael Crosby
ab137bfef8 Merge pull request #899 from ijc25/prepareStdio-named-return 
prepareStdio: use named return for err
 2017-05-24 09:22:47 -07:00
Kenfe-Mickaël Laventure
3752565920 Merge pull request #896 from dmcgowan/container-metadata-bolt 
Store container metadata in boltdb buckets
 2017-05-24 07:47:41 -07:00
Ian Campbell
d7deba03a2 prepareStdio: use named return for err 
This avoids issues with the various deferred error handlers in the event that
`err` is shadowed or named differently, which this function currently avoids
but which is an easy trap to fall into.

Since named return values are all or nothing we need to name the waitGroup too
and adjust the code to suite.

Thanks to Aaron Lehmann for the suggestion, see also
https://github.com/docker/swarmkit/pull/1965#discussion_r118137410

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-24 15:34:39 +01:00
Phil Estes
c257deb1a0 Merge pull request #895 from dmcgowan/delete-windows-snapshotter 
Skip snapshot removal on windows
 2017-05-24 04:59:31 -04:00
Lantao Liu
751f119cbc Merge pull request #45 from Crazykev/update-k8s-vendor 
Update kubernetes vendor for new CRI change
 2017-05-23 20:22:12 -07:00
Crazykev
49e7ef2153 update kubernetes vendor for new CRI change 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
 2017-05-24 10:25:55 +08:00
Derek McGowan
40d338b12c
Skip snapshot removal on windows 
Windows snapshotter is not yet implemented

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-23 17:18:31 -07:00
Derek McGowan
f98a4f10df
Store container metadata in boltdb buckets 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-23 17:11:29 -07:00
Kenfe-Mickaël Laventure
c00d731cc2 Merge pull request #894 from dmcgowan/container-metadata-service 
[carry #859] api/services: define the container metadata service
 2017-05-23 17:01:05 -07:00
Lantao Liu
6ce1dc0167 Merge pull request #44 from Random-Liu/stop-on-cancellation 
Stop waiting on cancellation.
 2017-05-23 15:08:57 -07:00
Kenfe-Mickaël Laventure
db6194b918 Merge pull request #893 from ehazlett/bump-fifo 
Bump fifo dependency to 69b995
 2017-05-23 14:47:31 -07:00
Derek McGowan
e1ed4a2ea4
Add json storage for container storage 
This is just a temporary storage solution to get
containers running on the new code.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-23 14:22:20 -07:00
Evan Hazlett
617a2270f6
bump fifo dependency to 69b995 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-23 14:14:54 -04:00
Derek McGowan
735b0e515e
Add push object 
Split resolver to only return a name with separate methods
for getting a fetcher and pusher. Add implementation for
push.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-23 10:52:51 -07:00
Lantao Liu
40514f332a Merge pull request #40 from xlgao-zju/add-cni 
Add network plugin
 2017-05-23 09:14:31 -07:00
Xianglin Gao
4a4414987f Add unit test 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
 2017-05-23 18:30:20 +08:00
Xianglin Gao
6d2b9fabca And setup and teardown 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
 2017-05-23 15:17:40 +08:00
Xianglin Gao
87c704bdf5 Update vendor 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
 2017-05-23 15:17:34 +08:00
Stephen J Day
539742881d
api/services: define the container metadata service 
Working from feedback on the existing implementation, we have now
introduced a central metadata object to represent the lifecycle and pin
the resources required to implement what people today know as
containers. This includes the runtime specification and the root
filesystem snapshots. We also allow arbitrary labeling of the container.
Such provisions will bring the containerd definition of container closer
to what is expected by users.

The objects that encompass today's ContainerService, centered around the
runtime, will be known as tasks. These tasks take on the existing
lifecycle behavior of containerd's containers, which means that they are
deleted when they exit. Largely, there are no other changes except for
naming.

The `Container` object will operate purely as a metadata object. No
runtime state will be held on `Container`. It only informs the execution
service on what is required for creating tasks and the resources in use
by that container. The resources referenced by that container will be
deleted when the container is deleted, if not in use. In this sense,
users can create, list, label and delete containers in a similar way as
they do with docker today, without the complexity of runtime locks that
plagues current implementations.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-22 23:27:53 -07:00
Lantao Liu
84390cc6a7 Stop waiting on cancellation. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-05-23 05:47:48 +00:00
Xianglin Gao
c541515674 Add flags and initialize network plugin 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
 2017-05-23 12:48:36 +08:00
Qiang Huang
8f3b89c79d Merge pull request #890 from darrenstahlmsft/revendorGowinio 
Update go-winio to v0.4.1
 2017-05-23 10:21:59 +08:00
Phil Estes
347c48437c Merge pull request #888 from dmcgowan/remove-travis-1.7 
Remove go 1.7 in travis
 2017-05-22 20:27:11 -04:00
Darren Stahl
ae6f82241d Update go-winio to v0.4.1 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-05-22 17:08:03 -07:00
Derek McGowan
962d991a44 Merge pull request #887 from crosbymichael/mounts 
Move Mount into mount pkg
 2017-05-22 16:50:46 -07:00
Derek McGowan
a7e8928a08
Remove go 1.7 in travis 
Support for go 1.7 is no longer targeted. Remove to allow
features added since go 1.7.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-22 16:48:53 -07:00