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

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
90d74528ed Merge pull request #1540 from estesp/revert-temp-image-ref 
Revert temp image reference change/fix WithCheckpoint()
 2017-09-21 13:06:59 -07:00
Phil Estes
2146feec26 Merge pull request #1534 from crosbymichael/metricsv1 
Add v1 to metrics API endpoint
 2017-09-21 15:48:14 -04:00
Phil Estes
e2f3e310c3
Make WithCheckpoint() work with manifest list images 
Simple change to allow checkpoint image references to be manifest list
images.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-09-21 15:26:21 -04:00
Phil Estes
cadee0374b
Revert "Merge pull request #1502 from crosbymichael/test-image" 
This reverts commit 558b46f26e, reversing
changes made to 0e616f4d7a.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-09-21 15:25:34 -04:00
Michael Crosby
d67763d922 Add wait API endpoint for waiting on process exit 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-21 15:03:58 -04:00
Lantao Liu
9015b6ec68 Merge pull request #209 from Random-Liu/checkpoint-recovery 
Checkpoint recovery
 2017-09-21 11:32:49 -07:00
Lantao Liu
cc1b0b6709 Add restart recovery logic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 17:59:46 +00:00
Phil Estes
2f5dda6229 Merge pull request #1536 from stevvooe/foreign-layers 
images, remotes: add support for foreign layers
 2017-09-21 10:05:08 -04:00
Michael Crosby
26329b2b8d Merge pull request #1535 from dmcgowan/fix-pull-multi-arch 
Add platform filtering on children handler
 2017-09-21 09:45:26 -04:00
Abhinandan Prativadi
bafc7be9be kubernetes + containerd installer 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-20 22:32:09 -07:00
Lantao Liu
90d6e44c22 Merge pull request #267 from Random-Liu/fix-apparmor 
Fix apparmor empty case.
 2017-09-20 21:53:28 -07:00
Lantao Liu
dd3421c3c7 Fix apparmor empty case. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 04:07:39 +00:00
Stephen J Day
13771fba83
images, remotes: add support for foreign layers 
Add support for downloading layers with external URLs and
foreign/non-distributable mediatypes. This ensures that encountered
windows images are downloaded correctly. We still need to filter out the
extra windows resources when pulling linux, but this is a step towards
correctly supporting multi-platform images.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-20 17:06:13 -07:00
Lantao Liu
55a088763e Merge pull request #266 from Random-Liu/update-ocicni 
Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e
 2017-09-20 16:42:24 -07:00
Derek McGowan
eef47ffad3
Add platform filtering on children handler 
Fixes pulling of multi-arch images by limiting the expansion
of the index by filtering to the current default platform.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-09-20 15:18:18 -07:00
Lantao Liu
2907566565 Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 21:58:18 +00:00
Michael Crosby
f23edd3cc0 Add v1 to metrics API endpoint 
Fixes #1399

This versions the prometheus metrics API so we can manage backwards
incompatible changes in the future more easily.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-20 16:24:30 -04:00
Phil Estes
9934acb271 Merge pull request #1532 from mikebrow/seccomp-default-proc-fix 
fixes missing default permission
 2017-09-20 15:32:36 -04:00
Phil Estes
ef5f2025aa Merge pull request #1533 from stevvooe/specifier-default 
platforms: provide simpler function for common use
 2017-09-20 15:15:12 -04:00
Stephen J Day
9163377123
platforms: provide simpler function for common use 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-20 11:56:59 -07:00
Kenfe-Mickaël Laventure
78c4e5501c Merge pull request #1529 from crosbymichael/console 
Close epoller on task delete
 2017-09-20 11:24:52 -07:00
Mike Brown
120bb4cd47 fixes missing default permission 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-20 13:15:39 -05:00
Lantao Liu
5dbba596e6 Merge pull request #260 from yanxuean/use-containerd-extension 
Switch to containerd extension
 2017-09-20 10:36:57 -07:00
Abhinandan Prativadi
f3426cd6b9 Merge pull request #256 from abhinandanpb/crictl 
Adding crictl to install deps
 2017-09-20 09:25:33 -07:00
yanxuean
e1a7a0ea76 Switch to containerd extension 
fix #251

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-21 00:15:10 +08:00
Michael Crosby
7030a4add0 Close epoller on task stop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-20 11:29:13 -04:00
Michael Crosby
781ce658c8 Update console dep to b28c739c79ce69d017e3691ad366 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-20 11:16:56 -04:00
Abhinandan Prativadi
e4077e915b Add crictl cli to install deps 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-20 07:38:29 -07:00
Lantao Liu
a2dbc6ec1c Merge pull request #261 from ijc/volume-copyup 
Implement volume copy up.
 2017-09-20 02:30:36 -07:00
Lantao Liu
9c533dca14 Merge pull request #262 from ijc/sandbox-getip-improvements 
Do not attempt to retrieve IP from host network namespace
 2017-09-20 02:22:07 -07:00
Ian Campbell
9c3c38d9ab Do not attempt to retrieve IP from host network namespace 
Since sandboxes which use the host network have no network namespace path this
would result in an invalid invocation of nsenter.

Rework the fetching of the sandbox to take this into account and also avoid
trying to get an IP when the network plugin is not yet ready.

Fixes #245.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-20 09:53:56 +01:00
Ian Campbell
8c6ba35038 Implement volume copy up. 
This pulls in and uses github.com/docker/docker/pkg/chrootarchive for the
actual copy up which is some battle hardened code to unpack avoiding things
like symlink traversal security issues.

However it does pull in a pretty huge pile of vendoring, including
github.com/docker/docker/pkg/reexec which we must then call at startup. It's
not immediately clear that this tradeoff is the correct one.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-20 09:52:27 +01:00
Lantao Liu
9d8f74227f Merge pull request #264 from Random-Liu/update-kubernetes 
Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace
 2017-09-19 21:26:22 -07:00
Lantao Liu
5af5a04b6f Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 01:31:26 +00:00
Lantao Liu
3647ff5976 Merge pull request #263 from Random-Liu/fix-log 
Fix one line of log, we are writing not reading.
 2017-09-19 13:24:28 -07:00
Lantao Liu
45f98a0b39 Fix one line of log, we are writing not reading. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-19 18:53:45 +00:00
Michael Crosby
d700a9c35b Merge pull request #1500 from crosbymichael/typeurl 
Use external typeurl package
 2017-09-19 11:03:52 -04:00
Michael Crosby
d22160c28e Vendor typeurl package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-19 09:43:55 -04:00
Michael Crosby
929283a3ab Remove typeurl package from repo 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-19 09:43:31 -04:00
Lantao Liu
437131299b Merge pull request #230 from miaoyq/ensure-mount-shared-slave 
Ensure the mount point is propagated
 2017-09-19 00:56:27 -07:00
Yanqiang Miao
49eb38a5d4 Ensure the mount point is propagated 
mount with `rshared`, the host path should be shared.
mount with `rslave`, the host pash should be shared or slave.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-09-19 14:21:21 +08:00
Lantao Liu
7d25e7a832 Merge pull request #258 from Random-Liu/gcr-private-registry 
Gcr private registry and node e2e fix
 2017-09-18 12:47:09 -07:00
Michael Crosby
f41871be9d Merge pull request #1515 from dmcgowan/add-akihiro 
Add Akihiro as maintainer
 2017-09-18 15:38:04 -04:00
Lantao Liu
7f8f563019 Enable gcr private registry node e2e test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-18 18:19:26 +00:00
Lantao Liu
91ca178275 Update containerd to include the gcr private registry fix 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-18 18:19:26 +00:00
Kenfe-Mickaël Laventure
0cb2c961b2 Merge pull request #1519 from crosbymichael/contrib 
Add readme to contib
 2017-09-18 10:50:46 -07:00
Michael Crosby
58015abbd5 Add readme to contib 
Closes #1442

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-18 11:47:27 -04:00
Kenfe-Mickaël Laventure
e517952bc7 Merge pull request #1378 from cpuguy83/container_store_extra_data 
Add `Container` field to store client-defined data
 2017-09-18 07:32:07 -07:00
Michael Crosby
59384ffdb0 Merge pull request #1522 from qingyunha/master 
README.md: correct headers level
 2017-09-18 10:06:28 -04:00
Lantao Liu
a8d4940285 Merge pull request #227 from yanxuean/tomldefault 
Add a default config file
 2017-09-17 22:38:40 -07:00