Commit Graph

447 Commits

Author SHA1 Message Date
Lantao Liu
55ee423224 Merge pull request #175 from Random-Liu/disable-pid-ns-sharing
Disable pid namespace sharing
2017-08-29 13:14:18 -07:00
Lantao Liu
c2fb61b5fe Merge pull request #178 from Random-Liu/fix-leak-files
Fix leak files
2017-08-29 13:13:01 -07:00
Lantao Liu
b73161627d Fix fifo files leakage.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 21:14:35 +00: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
3b2d29be46 Merge pull request #177 from miaoyq/related-to-173
Exclude the event of sandbox containers from event stream
2017-08-28 10:00:21 -07:00
Yanqiang Miao
b18542c586 Excloude the event of sandbox containers from event stream
We should exclude the event of sandbox containers from event
stream in order to avoid outputting unexpected error print.

related #173

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-28 14:21:03 +08:00
Lantao Liu
113964e499 Merge pull request #174 from Random-Liu/fix-network-teardown
Do not teardown when network namespace is removed already.
2017-08-27 22:56:43 -07:00
Lantao Liu
f46cd1a71a Disable pid namespace sharing
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:44:46 +00:00
Lantao Liu
fda30c3ad2 Do not teardown when network namespace is removed already.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:10:30 +00:00
Lantao Liu
8fd54d2f2d Merge pull request #172 from Random-Liu/fix-run-as-user
Fix run as user
2017-08-25 14:40:06 -07:00
Lantao Liu
270e09ab26 Use containerd WithUserID.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 21:11:56 +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
980e8e8007 Merge pull request #168 from Random-Liu/add-run-as-user
Add RunAsUser support
2017-08-25 13:45:47 -07:00
Lantao Liu
7313331f2e Merge pull request #171 from Random-Liu/not-checkpoint-sandbox-pid
Do not checkpoint sandbox pid.
2017-08-24 20:23:16 -07:00
Lantao Liu
60d8430ac1 Do not checkpoint sandbox pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 01:38:05 +00:00
Lantao Liu
a80df151d1 Add RunAsUsername support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 00:47:35 +00:00
Lantao Liu
e1f74f00a5 Various security related fixes
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 21:52:30 +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
e559804b37 Merge pull request #167 from Random-Liu/remove-unused-code
Remove unused code.
2017-08-24 14:43:23 -07:00
Lantao Liu
b671465d7f Merge pull request #165 from Random-Liu/fix-node-e2e
Not printing any log for node e2e.
2017-08-24 14:42:58 -07:00
Lantao Liu
6f679fd175 Merge pull request #161 from Random-Liu/sandbox-createdat-from-containerd
Get CreatedAt from containerd instead of maintaining it ourselves.
2017-08-24 12:01:50 -07:00
Lantao Liu
a795927c5a Get CreatedAt from containerd instead of maintaining it ourselves.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 18:38:00 +00:00
Lantao Liu
73bb9696e8 Merge pull request #151 from Random-Liu/add-instrumented-service
Add instrumented service.
2017-08-24 11:26:39 -07:00
Lantao Liu
36da027c20 Merge pull request #138 from abhinandanpb/p_netns
Creating sandbox namespace
2017-08-24 11:26:21 -07:00
Lantao Liu
c6895d0856 Remove unused code.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 18:04:05 +00:00
Lantao Liu
c6191122f2 Merge pull request #163 from abhinandanpb/containerd-alpha6
Updating to container1.0-alpha
2017-08-24 10:43:43 -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
Lantao Liu
26e3718d6b Not printing any log for node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 17:20:59 +00:00
Lantao Liu
b27ee85f74 Merge pull request #146 from zhangzhenhao/master
add the user id support of runAsUser
2017-08-24 10:18:26 -07:00
zhangzhenhao
331e542c09 add the user id support of runAsUser
Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
2017-08-24 23:29:45 +08: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
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