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

68 Commits

Author SHA1 Message Date
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
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
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
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
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
Yanqiang Miao
0c3304e006 Support selinux options/label 
Support selinux optios/label

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-08-31 19:20:12 +08:00
Lantao Liu
ac4f238f48 Cleanup image operations. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-31 00:52:09 +00:00
Lantao Liu
130aa5ac0d Checkpoint container status onto disk. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-31 00:41:52 +00:00
Abhinandan Prativadi
e1edeae4c9 Adding option to configure cgroup to start cri-containerd 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-30 14:37:40 -07:00
Lantao Liu
9d5b5f9c26 Update containerd to cf09e32618. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-28 20:45:09 +00:00
Lantao Liu
55d3abdb89 Update containerd to 360e46ddda 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-25 21:11:56 +00:00
Lantao Liu
8d1b737480 Update containerd to a6ce1ef2a1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-24 21:47:52 +00:00
Lantao Liu
36da027c20 Merge pull request #138 from abhinandanpb/p_netns 
Creating sandbox namespace
 2017-08-24 11:26:21 -07:00
Abhinandan Prativadi
5a119200b8 Creating permanent sandbox namespace 
This commit contains changes to create/delete permanent namespace
for a sandbox container.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-24 10:43:42 -07:00
Abhinandan Prativadi
728dced6a1 Updating to container1.0-alpha 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-23 23:17:21 -07:00
Lantao Liu
42500353b7 Vendor ocicni from upstream. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 22:23:29 +00:00
Lantao Liu
8f898cb3b8 Import ocicni update from https://github.com/Random-Liu/ocicni 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 01:25:12 +00:00
Lantao Liu
af83d3e1f7 Update CNI to v0.6.0 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 01:23:24 +00:00
Yanqiang Miao
fa5c4ab2a7 Update containerd version to f79981c 
fixes #140
ref containerd/containerd#1386

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-08-18 15:04:02 +08:00
Abhinandan Prativadi
32e0313418 Containerd client integration 
This commit:
1) Replaces the usage of containerd GRPC APIs with the containerd client for all operations related to containerd.
2) Updated containerd to v1.0alpha4+
3) Updated runc to v1.0.0

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-16 14:43:22 -07:00
Lantao Liu
8f6558aee6 Update docker and cri-o to include the sirupsen fix. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-09 23:29:19 +00:00
Lantao Liu
53a8cdf14f Vendor kubernetes streaming server 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-07 19:05:16 +00:00
Lantao Liu
ac4c5e8989 Add script to rewrite Sirupsen to sirupsen in vendor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-05 00:37:19 +00:00
Lantao Liu
20860f2ecb Use vndr instead of godep. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-04 02:41:26 +00:00
Lantao Liu
1c2f306a65 Manually get rid of Sirupsen reference 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-02 23:21:38 +00:00
Lantao Liu
a4f7f7127b Vendor containerd 2386062 and runtime-tools e29f3ca. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-02 23:21:37 +00:00
Lantao Liu
4d7735567c Merge pull request #82 from mikebrow/containerd-client-library 
Use containerd client library to connect to containerd services
 2017-06-20 19:03:18 -07:00
Mike Brown
97063a0e34 switch to client provided services and address nits 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-06-20 19:19:14 -05:00
Mike Brown
0fe8c17fdf godeps udpate 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-06-20 19:18:48 -05:00