Mike Brown
983994dc87
fixing vet errors
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-11-27 13:13:21 -06:00
Mike Brown
34340f502d
Merge pull request #428 from antony360/fix-readme-bug
...
contrib instead of contib
2017-11-26 14:06:17 -06:00
Antoine Huret
7814230fd9
contrib instead of contib
...
Signed-off-by: Antoine Huret <huret.antoine@yahoo.fr>
2017-11-26 16:54:30 +01:00
yanxuean
b4ebf2d7a7
improve localResolve
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-23 10:56:12 +08:00
yanxuean
cbe7f0dd5a
use docker.digestSet store image truncid
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-23 10:55:59 +08:00
Lantao Liu
18df4338e6
Merge pull request #429 from Random-Liu/update-hack-versions
...
Update kubernetes version in `hack/versions`
2017-11-22 11:42:14 -08:00
Lantao Liu
f6bc65bf7a
Update kubernetes version in hack/versions
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-22 18:46:15 +00:00
Lantao Liu
6104fcba3c
Merge pull request #421 from Random-Liu/add-new-cri-log-support
...
Add new cri log support
2017-11-21 13:09:57 -08:00
Lantao Liu
48726ecd27
Add support for CRI partial log.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-21 19:24:12 +00:00
Lantao Liu
cb0d97e74c
Update kubernetes version.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-21 19:24:12 +00:00
Lantao Liu
ce29d516d5
Merge pull request #427 from Random-Liu/clean-sandbox-remove
...
Do not remove sandbox when netns is not closed.
2017-11-21 10:00:36 -08:00
Lantao Liu
76268ea242
Do not remove sandbox when netns is not closed.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-21 01:22:19 +00:00
Lantao Liu
74df3cc146
Merge pull request #424 from Random-Liu/duplicate-name-test
...
Should not be able to create existing sandbox/container.
2017-11-20 11:07:33 -08:00
Lantao Liu
6ab809f712
Should not be able to create existing sandbox/container.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-20 04:05:14 +00:00
Lantao Liu
a1ac0c4f3a
Merge pull request #422 from Random-Liu/reduce-verify-concurrency
...
Move verify to kubernetes test-infra.
2017-11-17 18:38:47 -08:00
Lantao Liu
579981e47b
Move verify to kubernetes test-infra.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-18 01:32:53 +00:00
Mike Brown
921be46c49
Merge pull request #420 from Random-Liu/add-unit-test
...
Add simple unit test.
2017-11-17 08:29:57 -06:00
Lantao Liu
3f80fe06ef
Add simple unit test.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-16 23:04:33 +00:00
Lantao Liu
2143959895
Merge pull request #415 from jessfraz/release-static-binaries
...
Makefile: release static binaries
2017-11-15 18:17:55 -08:00
Jess Frazelle
c8584f2a6d
Makefile: release static binaries
...
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
2017-11-15 03:29:51 -05:00
Lantao Liu
6d4e41e4e4
Merge pull request #414 from Random-Liu/fix-data-race
...
Fix data race.
2017-11-13 23:04:44 -08:00
Lantao Liu
03aca5e82b
Fix data race.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-14 05:35:44 +00:00
Lantao Liu
574dfd8c19
Merge pull request #413 from Random-Liu/print-full-container-spec
...
Print full container spec for debugging.
2017-11-13 17:36:52 -08:00
Lantao Liu
57f37ca66e
Print full container spec for debugging.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-13 23:36:12 +00:00
Lantao Liu
a61d86cf50
Merge pull request #412 from Random-Liu/fix-streaming-deadlock
...
Fix streaming deadlock.
2017-11-13 09:31:16 -08:00
Lantao Liu
01493463db
Fix streaming deadlock.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-13 05:51:14 +00:00
Lantao Liu
e1015b8d91
Merge pull request #410 from Random-Liu/refactor-and-fix-streaming
...
Refactor and fix container streaming.
2017-11-10 14:03:49 -08:00
Lantao Liu
3557cffbbb
Fix container exec
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 21:03:29 +00:00
Lantao Liu
e41b6d3c24
Refactor container io code
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 21:03:29 +00:00
Mike Brown
b4c8efd898
Merge pull request #409 from miaoyq/fix-408
...
Update golang version to 1.9.x
2017-11-10 09:03:56 -06:00
Yanqiang Miao
a8104ef21b
Update golang version to 1.9.x
...
fixes #408
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-11-10 15:58:24 +08:00
Lantao Liu
ac8b0979fa
Merge pull request #407 from Random-Liu/update-containerd
...
Update containerd to v1.0.0-beta.3
2017-11-09 16:00:25 -08:00
Lantao Liu
9e6d607aae
Update containerd to v1.0.0-beta.3
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 21:08:09 +00:00
Lantao Liu
b6de04772d
Merge pull request #406 from Random-Liu/fix-attach-stdin
...
Keep stdin open instead of opening when use it.
2017-11-09 10:31:04 -08:00
Lantao Liu
c4931c8409
Keep stdin open instead of opening when use it.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 09:28:30 +00:00
Lantao Liu
2433ae7539
Merge pull request #393 from abhi/labels
...
Adding kube pod and container labels to containerd
2017-11-07 23:39:20 -08:00
abhi
cd5886d647
Adding kube pod and container labels to containerd
...
Currently we have the pod and container labels part of
containerd metadata extensions. However for third party users
like cadvisor that depend on standard kube labels will need
to be aware of the way metadata is stored in containerd to
fetch the labels.
Signed-off-by: abhi <abhi@docker.com>
2017-11-07 22:19:19 -08:00
Lantao Liu
472f74e952
Merge pull request #403 from Random-Liu/cleanup-config
...
Cleanup config.
2017-11-07 14:07:20 -08:00
Lantao Liu
5bbf83bc5d
Cleanup config.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-07 21:02:58 +00:00
Lantao Liu
affc6e93a8
Merge pull request #397 from yanxuean/trunc-for-list
...
Add truncindex for filter in List and Stat
2017-11-07 00:41:03 -08:00
yanxuean
12bbbc0edc
add unit test for listcontainer and listpodsandbox
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-07 15:57:29 +08:00
Lantao Liu
6ee3db4825
Merge pull request #402 from Random-Liu/fix-attach-tty
...
Reverse the wrong logic for tty.
2017-11-06 21:16:38 -08:00
Lantao Liu
75e97dd168
Reverse the wrong logic for tty.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-07 02:03:44 +00:00
Lantao Liu
b9d4eda403
Merge pull request #401 from Random-Liu/add-comment
...
Add comment for #398 .
2017-11-06 14:09:50 -08:00
Lantao Liu
68e74dc16a
Merge pull request #394 from Random-Liu/fix-container-streaming
...
Various fixes for container streaming.
2017-11-06 14:09:30 -08:00
Lantao Liu
6f97764171
Add comment for #398 .
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 20:54:50 +00:00
Lantao Liu
eec818e6ab
Various fixes for container streaming.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 20:50:50 +00:00
Lantao Liu
e363c218d6
Merge pull request #395 from Random-Liu/fix-image-in-container-status
...
Return image tag as image spec.
2017-11-06 10:55:37 -08:00
Lantao Liu
b6a1697c75
Merge pull request #396 from weiwei04/ansible
...
replace deprecated ansible include cmd
2017-11-06 10:37:56 -08:00
Lantao Liu
7c4c80befb
Merge pull request #398 from justincormack/remove-comment-read-only
...
Remove comment about whether other paths should be read only with root
2017-11-06 10:31:49 -08:00