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

517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2faa665eb2 Merge pull request #155 from miaoyq/support-nonewprivileges 
Support NoNewPrivileges
 2017-08-23 20:58:38 -07:00
Yanqiang Miao
1aec120d5f Support NoNewPrivileges 
fixes #117

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-08-24 08:37:40 +08:00
Lantao Liu
60c7f5127e Merge pull request #128 from Random-Liu/add-container-attach 
Add container attach
 2017-08-23 17:20:04 -07:00
Lantao Liu
45ee2e554a Add container attach support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 23:48:31 +00:00
Lantao Liu
77b703f1e7 Move generateID to util. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 23:46:55 +00:00
Lantao Liu
07e3a2b5e2 Merge pull request #160 from Random-Liu/update-ocicni 
Vendor ocicni from upstream.
 2017-08-23 16:04:25 -07:00
Lantao Liu
dd6e9fb88d Merge pull request #156 from yanxuean/metalabel 
Checkpoint and restart recovery
 2017-08-23 15:36:19 -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
yanxuean
d2757cb8f9 Checkpoint and restart recovery 
fix part of #120

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-08-23 17:01:13 +08:00
Lantao Liu
195b52500f Add instrumented service. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 07:02:12 +00:00
Lantao Liu
7901f56367 Merge pull request #150 from Random-Liu/support-update-container-resources 
Support update container resources
 2017-08-22 23:28:48 -07:00
Lantao Liu
b291ec0fa2 Merge pull request #154 from Random-Liu/add-host-port 
Add host port support.
 2017-08-22 23:26:43 -07:00
Lantao Liu
f6d99abcf4 Add hostport support 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 01:33:02 +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
Lantao Liu
810ffbb9b6 Merge pull request #152 from Random-Liu/fix-node-e2e 
Fix node e2e test.
 2017-08-22 11:55:54 -07:00
Lantao Liu
a0589d37dd Implement container resources update 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-22 18:40:30 +00:00
Lantao Liu
01137e4591 Merge pull request #148 from Random-Liu/update-kubernetes 
Update kubernetes
 2017-08-22 11:38:55 -07:00
Lantao Liu
77095f569a Fix node e2e test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-22 18:12:14 +00:00
Lantao Liu
d41c23e31d Update code to make it build 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-22 05:38:51 +00:00
Lantao Liu
39f4ca648b Update Kubernetes to 493ee8b28560c118cebd2165ba9ef0959cfa2bc3 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-22 05:38:51 +00:00
Lantao Liu
50b01812ce Merge pull request #147 from miaoyq/group-all-privileged-logic 
Group all privileged logic together
 2017-08-21 18:43:06 -07:00
Yanqiang Miao
8adad23015 Group all privileged logic together 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-08-22 09:16:37 +08:00
Lantao Liu
010a562057 Merge pull request #145 from Random-Liu/add-node-e2e-ci 
Add node e2e test CI.
 2017-08-21 14:41:08 -07:00
Lantao Liu
c05a7e74ee Add node e2e test CI. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-21 21:21:41 +00:00
Lantao Liu
dcc3cb2a05 Merge pull request #137 from Random-Liu/cleanup-with-new-client 
Some cleanup after switching to new client.
 2017-08-18 15:04:24 -07:00
Lantao Liu
ed640d3972 Some cleanup after switching to new client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-18 21:04:38 +00:00
Lantao Liu
418a5cd8bf Merge pull request #143 from miaoyq/update-containerd-ver-to-f79981 
Update containerd version to f79981c
 2017-08-18 10:28:56 -07: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
Lantao Liu
8e9a251f72 Merge pull request #135 from yanxuean/myfeature 
The parameters of InitCNI should be filled in reverse order
 2017-08-16 19:50:22 -07:00
yanxuean
8cc0347b0a The parameters of InitCNI should be filled in reverse order. 
fix  #131

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-08-17 10:18:40 +08:00
Lantao Liu
860dac233f Merge pull request #130 from Random-Liu/add-port-forward 
Add portforward support.
 2017-08-16 17:47:34 -07:00
Lantao Liu
f555bb1242 Add portforward support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-17 00:13:31 +00:00
Lantao Liu
1ae4ee8325 Merge pull request #113 from abhinandanpb/client 
Replacing containerd GRPC API with client
 2017-08-16 16:45:04 -07: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
76652ef49a Merge pull request #134 from mikebrow/goversionupdate 
Putting in the go versions we want to test against
 2017-08-15 22:38:23 -07:00
Mike Brown
f3c12edf3b parallel script execution for each go version within stage 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-08-16 00:20:43 -05:00
Mike Brown
7d1b3a5af8 adding stages to test the right go versions 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-08-15 10:52:11 -05:00
Mike Brown
f2a228b6f8 Merge pull request #129 from mbssaiakhil/patch-1 
Fix Typo in Events Code of Conduct
 2017-08-15 09:36:30 -05:00
Malepati Bala Siva Sai Akhil
5ce5868bf1 Fix Typo in Events Code of Conduct 
Signed-off-by: Malepati Bala Siva Sai Akhil <malepatib.akhil@huawei.com>
 2017-08-15 19:37:07 +05:30
Lantao Liu
7ba0679e14 Merge pull request #132 from asifdxtreme/patch-1 
Split the travis Build in different Build and Test Stage
 2017-08-14 21:07:56 -07:00
asifdxtreme
b927292327 Update stage as per suggestion 
Signed-off-by: asifdxtreme <mohammad.asif.siddiqui1@huawei.com>
 2017-08-15 10:02:20 +08:00
Mohammad Asif Siddiqui
b55e75b55e Split Travis Build in Stages 
Signed-off-by: asifdxtreme <mohammad.asif.siddiqui1@huawei.com>
 2017-08-15 09:32:42 +08:00
Lantao Liu
83a20c9fd1 Merge pull request #127 from Random-Liu/containerd-spec-tty 
Use containerd spec generator to set tty.
 2017-08-11 14:49:17 -07:00
Lantao Liu
2427d332f0 Add TERM=xterm when tty=true. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-11 16:53:40 +00:00
Lantao Liu
86a0f6a59b Merge pull request #126 from miaoyq/change-defaut-spec 
Replace the original default spec with containerd default spec
 2017-08-10 14:25:23 -07:00
Lantao Liu
8d0c896794 Merge pull request #114 from ijc/build-flags 
Allow setting of compiler options
 2017-08-10 10:28:09 -07:00
Yanqiang Miao
9cc93886ea Replace the original default spec with containerd default spec 
The original default spec contain `seccomp` configuration,
but some OS do not support this feature, such as ubuntu14.04,
and `make test-cri` always fail. The containerd default spec dosen't
contain `seccomp`, so I think we could replace the default spec
with containerd default spec.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-08-10 20:31:03 +08:00
Lantao Liu
b961e28d33 Merge pull request #119 from mikebrow/add-sysctls 
Sets sysctls from pod config annotations
 2017-08-09 18:23:15 -07:00