github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,778 Commits 3 Branches 2 Tags 112 MiB
498eebe860
Commit Graph

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
abhi
a1f4516661 Vendoring changes 
Signed-off-by: abhi <abhi@docker.com>
 2018-03-15 17:05:36 -07:00
abhi
003bbd4292 Modifying fake cni plugin 
Signed-off-by: abhi <abhi@docker.com>
 2018-03-15 17:05:33 -07:00
Lantao Liu
1eaef9ee10
Merge pull request #669 from Random-Liu/cleanup-event-backoff 
Cleanup event backoff.
 2018-03-15 16:28:59 -07:00
Lantao Liu
45f4037d3d
Merge pull request #670 from Random-Liu/enable-promic-mode 
Enable promisc mode because Kubernetes network model needs it.
 2018-03-15 16:27:54 -07:00
Lantao Liu
7e67d96b9b Replace ctrcri with ctr cri. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-15 23:22:00 +00:00
Lantao Liu
62d1f13217 Update containerd to 3c1ef1a714 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-15 23:21:32 +00:00
Lantao Liu
b82ca71b61 Enable promisc mode because Kubernetes network model needs it. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-15 22:21:10 +00:00
Lantao Liu
3c1ef1a714
Merge pull request #2212 from dmcgowan/fix-overlay-cleanup-race 
overlay: fix cleanup directory deletion race
 2018-03-15 15:13:30 -07:00
Lantao Liu
d389af83a9 Cleanup event backoff. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-15 18:49:36 +00:00
Lantao Liu
eff311d493
Merge pull request #628 from yanxuean/nits 
Handle containerd event reliably
 2018-03-15 11:35:59 -07:00
Michael Crosby
f117459c35 Bump runc to 69663f0bd4b60df09991c08812a60108003fa 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-03-15 14:14:41 -04:00
Michael Crosby
ee84187a6a
Merge pull request #2096 from stevvooe/include-zfs-by-default 
containerd: include zfs plugin by default
 2018-03-15 13:56:00 -04:00
yanxuean
c751847350 Handle containerd event reliably 
fix #434

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2018-03-15 17:14:02 +08:00
yanxuean
7583bce4ab some comments 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2018-03-15 15:55:54 +08:00
abhi
92110e1d74 Moving to use go-cni library from containerd 
This fix aims to use the cni library form containerd.
The library avoid usage of nsenter.

Signed-off-by: abhi <abhi@docker.com>
 2018-03-14 19:25:54 -07:00
Derek McGowan
a0b818e093
Merge pull request #2200 from jessvalarezo/multiarch-pulls 
allow content to be pulled for specific platform(s), all platforms
 2018-03-14 14:46:30 -07:00
Derek McGowan
94cf25f7db
overlay: fix cleanup directory deletion race 
Fixes a bug where a writable transaction may create or make changes to
a directory while the cleanup is running, leading to removal of a
directory which will be referenced.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-03-14 13:36:49 -07:00
Stephen J Day
f4113a903a
containerd: include zfs plugin by default 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-14 10:29:23 -07:00
Phil Estes
b307df2723
Merge pull request #2207 from jessvalarezo/ctr-task-d-update 
ctr: allow for force kill when deleting task process
 2018-03-14 03:41:23 -04:00
Derek McGowan
1a930e502b
Merge pull request #2175 from Random-Liu/plugin-cri-cli 
Plug-in cri subcommand
 2018-03-13 20:16:38 -07:00
Derek McGowan
8fc382cba3
Merge pull request #2208 from jessvalarezo/windows-runtime-platform 
windows: define platform in runtime plugin init
 2018-03-13 19:58:25 -07:00
Lantao Liu
ea6a10c412 Add cri subcommand and add ctr/command package 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-14 01:11:29 +00:00
Lantao Liu
9460f94c10 Update containerd/cri to 0c87604068 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-14 01:11:29 +00:00
Lantao Liu
0c87604068
Merge pull request #630 from Random-Liu/add-cli-package 
Add CLI package for `ctr` to use.
 2018-03-13 17:51:50 -07:00
Jess Valarezo
54a46068a1 windows: define platform in runtime plugin init 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-13 17:11:16 -07:00
Lantao Liu
22b1d526ce Add CLI package for ctr to use. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-13 23:51:45 +00:00
Lantao Liu
582975a903
Merge pull request #661 from mikebrow/rename-cri-containerd 
renames cri-containerd to cri
 2018-03-13 16:48:30 -07:00
Mike Brown
d4e7154625 move links for cri-containerd to cri 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-13 17:06:26 -05:00
Jess Valarezo
e343006b8f ctr: allow for force kill when deleting task process 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-13 14:58:31 -07:00
Lantao Liu
135f667963
Merge pull request #658 from Random-Liu/direct-function-call 
Direct function call
 2018-03-13 10:26:58 -07:00
Kenfe-Mickaël Laventure
6b0109942f
Merge pull request #2206 from stevvooe/images-alias 
cmd/ctr/images: add `i` alias for images command
 2018-03-13 06:27:36 -07:00
Lantao Liu
122909844e
Merge pull request #651 from miaoyq/add-doc-for-registry-config 
Add document about registry configuration
 2018-03-12 21:57:07 -07:00
Lantao Liu
f0a500a390 Use direct function call. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-13 04:51:19 +00:00
Lantao Liu
edb38dfecc Update containerd to 3013762fc5 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-13 04:41:11 +00:00
Stephen Day
220a479292
Merge pull request #1833 from dmcgowan/snapshot-gc-3rd-phase 
snapshots/overlay: add overlay cleanup
 2018-03-12 17:49:56 -07:00
Stephen J Day
ae11d8c64b
cmd/ctr/images: add i alias for images command 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-12 17:42:41 -07:00
Jess Valarezo
c3cf3d7822 allow content to be pulled for specific platform(s), all platforms 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-12 17:31:42 -07:00
Stephen Day
b3b95c0a2a
Merge pull request #2154 from dmcgowan/shared-content-ingests 
content: shared content across namespaces
 2018-03-12 16:11:32 -07:00
Stephen Day
3013762fc5
Merge pull request #2203 from Random-Liu/support-in-process-integration 
Support in process integration
 2018-03-12 14:38:27 -07:00
Derek McGowan
23ccbdd64f
Merge pull request #2159 from AkihiroSuda/check-overlay 
overlay: add Supported() checker
 2018-03-12 12:52:31 -07:00
Lantao Liu
1128b3d664 Add service plugin and support in process integration. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-12 18:03:50 +00:00
Lantao Liu
ba93435337 Temporary cri-containerd change 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-12 18:03:50 +00:00
Lantao Liu
80b2f751d3
Merge pull request #654 from stevvooe/simplify-stopch 
pkg/store: use a sync.Once to synchronize channel close
 2018-03-09 15:29:32 -08:00
Lantao Liu
e20c6eb8a8
Merge pull request #558 from Random-Liu/report-containerd-version 
Report containerd version instead of cri-containerd version.
 2018-03-09 15:25:32 -08:00
Stephen J Day
4ed26f3116
pkg/store: use a sync.Once to synchronize channel close 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-09 14:43:16 -08:00
Derek McGowan
edf7f410fb
Merge pull request #2199 from estesp/vndr-cgroups-fix-licenses 
Update cgroups vendor for license headers/bug fix
 2018-03-09 13:10:35 -08:00
Phil Estes
e38b2bbc3f
Update cgroups vendor for license headers/bug fix 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-03-09 15:54:13 -05:00
Akihiro Suda
44524909d1
Merge pull request #2197 from crosbymichael/deps 
Update containerd deps
 2018-03-09 12:23:06 +09:00
Michael Crosby
179382028a Update containerd deps 
This includes general fixes and the license change where the license is
included in all files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-03-08 13:57:30 -05:00
Phil Estes
544717986d
Merge pull request #2192 from kunalkushwaha/update-readme-ltag 
Adds note about applying license header
 2018-03-08 11:03:01 -05:00