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

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
2b8800df2b
Merge pull request #592 from Random-Liu/fix-registry-mirror 
Fix registry mirror.
 2018-02-02 15:37:29 -08:00
Lantao Liu
92995e29e5 Fix registry mirror. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-02 22:52:36 +00:00
Lantao Liu
b7c17ae06a
Merge pull request #585 from stevvooe/update-toml 
vendor: update BurntSushi/toml for MIT license
 2018-02-02 13:18:51 -08:00
Mike Brown
bec05e31df
Merge pull request #591 from Random-Liu/update-ocicni 
Update ocicni to my fork.
 2018-02-02 14:30:17 -06:00
Stephen J Day
680bafea76
vendor: update BurntSushi/toml for MIT license 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-02-02 11:53:48 -08:00
Lantao Liu
d113c16802 Update ocicni to my fork. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-02 19:45:26 +00:00
Lantao Liu
34dd28ab32
Merge pull request #586 from Random-Liu/add-ctrcri 
Add a separate CLI for cri-containerd `ctrcri`.
 2018-02-02 10:43:15 -08:00
Lantao Liu
2d61bdbb0a
Merge pull request #588 from Random-Liu/fix-registry-mirror 
Use registry-1.docker.io as backup
 2018-02-02 01:21:40 -08:00
Lantao Liu
3d94077144 Use registry-1.docker.io as backup 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-02 07:52:05 +00:00
Lantao Liu
1f1e03e001 Add a separate CLI for cri-containerd ctrcri. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-02 02:54:05 +00:00
Lantao Liu
59816f840f
Merge pull request #583 from Random-Liu/version-in-metadata 
Put version into metadata so that version won't be changed across reboot.
 2018-02-01 16:09:45 -08:00
Lantao Liu
05a4743d5f
Merge pull request #582 from Random-Liu/use-registry-mirror 
Set registry mirror.
 2018-02-01 15:23:45 -08:00
Lantao Liu
fb8d1edb5c Put version into metadata so that version won't be changed across 
restart.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-01 23:14:10 +00:00
Lantao Liu
c298d913b7
Merge pull request #584 from Random-Liu/add-golang-version 
Add golang version in `Status` info.
 2018-02-01 14:55:59 -08:00
Lantao Liu
7ddd9255b6 Add golang version in Status info. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-01 20:10:39 +00:00
Lantao Liu
4165c2b8c1
Merge pull request #581 from Random-Liu/update-containerd 
Update containerd to fix mount.Lookup.
 2018-02-01 11:10:06 -08:00
Lantao Liu
ead704ddd3 Set registry mirror. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-01 18:49:09 +00:00
Lantao Liu
a28672b088 Update containerd to fix mount.Lookup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-01 18:27:15 +00:00
Abhinandan Prativadi
8094fe69d4
Merge pull request #531 from abhi/registry-mirror 
Adding Registry Mirror support
 2018-01-31 13:01:25 -08:00
abhi
f3ccd85891 Adding Registry Mirror support 
This commit aims to add registy mirror support similar to
docker. The UI is similar to docker where user can
provide mirror urls and the image resolves against the provided
mirrors before fetching from default docker regitry mirror url.

Signed-off-by: abhi <abhi@docker.com>
 2018-01-31 10:47:34 -08:00
Mike Brown
175278a3e3
Merge pull request #579 from Random-Liu/kube-up-runtime-cgroups 
Configure container runtime cgroups for cgroup.
 2018-01-30 10:11:17 -06:00
Lantao Liu
6261a4a4ca
Merge pull request #484 from yanxuean/event-filter 
add filter for containerd event
 2018-01-30 00:27:43 -08:00
yason
6931a69881 add filter for containerd event 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2018-01-30 14:13:22 +08:00
Lantao Liu
15bba777aa Configure container runtime cgroups for cgroup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-30 02:56:03 +00:00
Lantao Liu
765c2c9341
Merge pull request #578 from Random-Liu/update-containerd 
Update containerd to ec15fe95aa.
 2018-01-29 13:39:22 -08:00
Lantao Liu
23e872a44d Update containerd to ec15fe95aa. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-29 18:44:16 +00:00
Lantao Liu
8d2d125d82
Merge pull request #577 from Random-Liu/fix-privileged-check 
Fix a privileged check.
 2018-01-27 20:24:09 -08:00
Lantao Liu
4dfd8250fd Fix a privileged check. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-27 02:25:52 +00:00
Lantao Liu
9f6315bc88
Merge pull request #576 from Random-Liu/add-benchmark-image-config 
Add image config for benchmark.
 2018-01-26 14:33:10 -08:00
Lantao Liu
5ed3262450 Add image config for benchmark. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-26 20:04:49 +00:00
Lantao Liu
08644a7fff
Merge pull request #575 from miaoyq/use-channel-propagate-stop-info-of-sandbox 
Use channel to propagate the stop info of sandbox
 2018-01-26 01:58:32 -08:00
Yanqiang Miao
61c1fdb098 Use channel to propagate the stop info of sandbox 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2018-01-26 16:58:13 +08:00
Lantao Liu
f401662123
Merge pull request #571 from Random-Liu/do-not-list-task 
Avoid containerd access as much as possible.
 2018-01-25 16:13:43 -08:00
Lantao Liu
df58d6825d Avoid containerd access as much as possible. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-25 23:36:00 +00:00
Lantao Liu
eb6e23ab49
Merge pull request #572 from Random-Liu/add-runtime-cgroup 
Add runtime cgroup and fix a cli panic.
 2018-01-25 15:14:47 -08:00
Lantao Liu
e7f2a74a84 Add runtime cgroup and fix a cli panic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-25 22:32:57 +00:00
Lantao Liu
11042a4141
Merge pull request #570 from miaoyq/fixes-569 
Use channel to pass the stop info instead of polling for container stop
 2018-01-25 10:27:18 -08:00
Yanqiang Miao
c663d2423e Use channel to pass the stop info instead of polling for container stop 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2018-01-25 11:07:54 +08:00
Lantao Liu
4fcf8d91b8
Merge pull request #567 from Random-Liu/update-containerd 
Update containerd and leverage plugin graceful stop.
 2018-01-23 16:24:25 -08:00
Lantao Liu
635e5747c0 Update containerd and leverage plugin graceful stop. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-23 22:46:46 +00:00
Lantao Liu
31845714ef
Merge pull request #564 from Random-Liu/update-containerd 
Update containerd to 4812f4be8f.
 2018-01-23 14:10:21 -08:00
Lantao Liu
1c2fef9f68
Merge pull request #563 from Random-Liu/disable-dad 
Disable IPv6 dad by default.
 2018-01-22 17:32:54 -08:00
Lantao Liu
dd125be836 Update containerd to 4812f4be8f. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-23 00:08:27 +00:00
Lantao Liu
2b6f084f36 Disable IPv6 dad by default. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-22 23:54:16 +00:00
Lantao Liu
6bb567d6a2
Merge pull request #557 from Random-Liu/use-containerd-config 
Use containerd config
 2018-01-21 00:50:56 -08:00
Lantao Liu
4e9ca399e1 Use containerd plugin config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-19 02:25:03 +00:00
Lantao Liu
9449892561
Merge pull request #555 from Random-Liu/move-cgroup-oom-to-cmd 
Move cgroup oom to cmd
 2018-01-18 18:24:42 -08:00
Lantao Liu
7d18d61674 Move cgroup and oom score setting to cmd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-19 01:35:36 +00:00
Lantao Liu
74d8880032
Merge pull request #552 from Random-Liu/use-containerd-grpc-server 
Use containerd grpc server
 2018-01-18 12:36:05 -08:00
Lantao Liu
a9d846af23 Upgrade test framework to talk to containerd sock. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 18:51:18 +00:00