github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
605 Commits 3 Branches 2 Tags 112 MiB
913836474b
Commit Graph

96 Commits

Author SHA1 Message Date
Yanqiang Miao
e79bf15dee Update 'hack/versions' and some Kubernetes repo 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 15:51:14 +08:00
Yanqiang Miao
72446e7e25 Update k8s to #53965 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:14:58 +08:00
Lantao Liu
c2796dfab3
Merge pull request #384 from Random-Liu/update-containerd 
Update containerd to 564600ee79.
 2017-11-02 15:59:50 -07:00
Mike Brown
df6f4a3655 adds help for load command (#383) 
* adds help for load command

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* vendor restrom/dedent

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-11-02 15:38:24 -07:00
Lantao Liu
1d61b7464b Update containerd to 564600ee79. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:17:38 +00:00
yanxuean
9027a02e8e Use image.IsUnpacked 
fix #361
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-01 13:51:25 +08:00
Lantao Liu
c6fd18ddc3 Update cobra and pflag 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 06:42:18 +00:00
Lantao Liu
8fb63c5664 Merge pull request #356 from Random-Liu/change-to-cli 
Change to cli
 2017-10-25 05:48:52 +02:00
Lantao Liu
7977970e04 Use cobra for cli. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-25 00:19:37 +00:00
w9n
1a6be2b573 update containerd, runc, cgroups, sys and docker version 
Signed-off-by: w9n <w9ncontact@gmail.com>
 2017-10-24 22:52:29 +02:00
Lantao Liu
61d598d00f Merge pull request #235 from yanxuean/truncindex 
Add Truncindex for container, sandbox and image
 2017-10-11 21:03:16 -07:00
yanxuean
5ee3423820 add truncindex 
fix #222

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-10-12 10:32:20 +08:00
Lantao Liu
bde8b0517e Update kubernetes and containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-11 06:16:19 +00:00
Lantao Liu
f7eaa29c67 Update containerd to 8558b98eb1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-06 01:40:39 +00:00
Lantao Liu
e64d267ae8 Update Kubenretes to the right version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 06:07:48 +00:00
Yanqiang Miao
a7471d79ab Update kubernetes version to the PR#52395 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-10-03 21:46:56 +08:00
Lantao Liu
126c0a0e80 Update kubernetes to v1.8.0-rc.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-28 21:28:27 +00:00
Lantao Liu
21233b22be Check seccomp enable and add unit test for seccomp/apparmor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-25 23:09:26 +00:00
Lantao Liu
b9200ac403 Merge pull request #257 from Random-Liu/add-image-stats 
Add image stats and integration test
 2017-09-25 15:35:30 -07:00
Lantao Liu
f7f944235b Update containerd to v1.0.0-beta.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-23 01:00:11 +00:00
Lantao Liu
b85be3d0cd Import CRI remote client package. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-22 23:37:58 +00:00
Lantao Liu
6363207315 Merge pull request #272 from Random-Liu/improve-selinux-apparmor-support 
Improve apparmor and selinux support.
 2017-09-22 15:09:59 -07:00
Lantao Liu
dd967cde8c Improve apparmor and selinux support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-22 20:46:31 +00:00
Lantao Liu
1fd8c2ffc3 Merge pull request #270 from Random-Liu/fix-checkpoint-recovery 
Fix checkpoint recovery.
 2017-09-22 00:48:00 -07:00
Mike Brown
78a925f57b vendor for new seccomp helpers 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-21 17:37:50 -05:00
Lantao Liu
ce9d27bd94 Fix checkpoint recovery. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 21:10:38 +00: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
Lantao Liu
2907566565 Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 21:58:18 +00:00
Lantao Liu
a2dbc6ec1c Merge pull request #261 from ijc/volume-copyup 
Implement volume copy up.
 2017-09-20 02:30:36 -07: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
5af5a04b6f Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 01:31: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
Mike Brown
8310fb4bfd update vendor 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-14 12:24:00 -05:00
Lantao Liu
b074388460 Update containerd to v1.0.0-beta.0 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-09 04:46:02 +00:00
Lantao Liu
777f001432 Merge pull request #200 from yanxuean/tomlconfig 
Add config file for cri-containerd
 2017-09-07 10:36:32 -07:00
yason
e1a8968f5a add config file for cri-containerd 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-07 15:07:47 +08:00
Lantao Liu
7a75a91578 Merge pull request #225 from Random-Liu/update-ocicni 
Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
 2017-09-06 21:04:45 -07:00
Lantao Liu
3e4b4234c6 Merge pull request #218 from miaoyq/fixes-185 
Update kubernetes version and support mount propagation
 2017-09-06 21:03:56 -07:00
Yanqiang Miao
9da460ec0a Support mount propagation 
fixex #185

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-09-07 08:58:20 +08:00
Lantao Liu
1c0385a650 Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-07 00:14:01 +00:00
Lantao Liu
e06c2c59e0 Merge pull request #179 from Random-Liu/checkpoint-container-status 
Checkpoint container status onto disk.
 2017-09-06 13:51:38 -07:00
Mike Brown
8a21e3f3c8 Merge pull request #206 from Random-Liu/ensure-remove-all 
Use EnsureRemoveAll
 2017-09-05 18:43:45 -05:00
Lantao Liu
2bf31ee08c Update vendor to include /docker/docker/pkg/system 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-05 20:28:53 +00:00
yanxuean
269aeb6734 add config file -- add despendency 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 16:20:02 +08:00
Lantao Liu
59e75d8c5e Merge pull request #208 from miaoyq/fixes-180 
Update cri-o/ocicni
 2017-09-03 20:04:12 -07:00
Yanqiang Miao
180e2e67af Update cri-o/ocicni 
fixes #180

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-09-03 21:42:49 +08:00
Lantao Liu
e12da22015 Update kubernetes version to 759ba487b33a7566111622e19de607aba45a7342. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-01 23:55:10 +00:00
Lantao Liu
aa3635c75a Merge pull request #183 from Random-Liu/cri-containerd-exit-with-containerd 
Cri containerd exits with containerd
 2017-09-01 16:39:38 -07:00
Mike Brown
9d479844c6 vendor k8s and containerd for apparmor fix 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-01 18:08:34 -05:00
Lantao Liu
82ee80d0fa Implement streaming server stop (Kubernetes#51377) 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-31 21:56:47 +00:00