github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,124 Commits 3 Branches 2 Tags 112 MiB
db43e3d1f7
Commit Graph

13124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Crosby
f5d81a631e Return grpc errs from task service 
Closes #1201

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 16:10:19 -04:00
Derek McGowan
887f97f2ff Merge pull request #1463 from stevvooe/switch-snapshot-kind 
snapshot: use switch to parse snapshot.Kind
 2017-09-05 12:44:57 -07:00
Michael Crosby
f7dc0ab9e1 Update golang/sys to 7ddbeae9ae08c6a06a59597f0c9ed 
ref #1422

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 15:39:46 -04:00
Lantao Liu
ade5f403d0 Merge pull request #210 from Random-Liu/release-tar-ball 
Add release tarball.
 2017-09-05 12:11:06 -07:00
Stephen J Day
1c31199797
snapshot: use switch to parse snapshot.Kind 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-05 11:04:15 -07:00
Michael Crosby
f4b84987c7 Merge pull request #1373 from AkihiroSuda/fix-snapshot-view 
mount: fix read-only bind
 2017-09-05 10:29:19 -04: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
yanxuean
ecf270d0d7 add log 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 15:52:59 +08:00
yanxuean
999156d147 add toml config file for cri-containerd 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 15:51:07 +08:00
yanxuean
99a87f1a29 Add toml config file for cri-containerd 
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-05 15:49:03 +08:00
Akihiro Suda
a560e5e0ef mount: fix read-only bind (#1368) 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-04 04:44:56 +00:00
Lantao Liu
a6b0e41d6b Add release tar. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-04 04:44:05 +00: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
b522ac9118 Merge pull request #207 from lanchongyizu/issue/make_sandbox_image_configurable 
Make sandbox container image configurable
 2017-09-03 00:39:35 -07:00
Jamie Zhuang
915f5b0aea Make sandbox container image configurable 
Signed-off-by: Jamie Zhuang <lanchongyizu@gmail.com>
 2017-09-03 02:53:17 -04:00
Lantao Liu
86e8a24977 Merge pull request #205 from Random-Liu/revert-193 
Revert "Setting containerd shim cgroup same as pod cgroup"
 2017-09-01 23:32:48 -07:00
Lantao Liu
c3cb1cfde8 Revert "Setting containerd shim cgroup same as pod cgroup" 
This reverts commit 59008c608e.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-02 04:20:55 +00:00
Lantao Liu
d0126752d2 Merge pull request #203 from Random-Liu/update-kubernetes 
Update kubernetes version to 759ba487b33a7566111622e19de607aba45a7342.
 2017-09-01 17:31:47 -07:00
Lantao Liu
911a90ce01 Merge pull request #153 from anfernee/master 
Fix build for multiple GOPATHs
 2017-09-01 17:05:35 -07: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
Lantao Liu
aa3635c75a Merge pull request #183 from Random-Liu/cri-containerd-exit-with-containerd 
Cri containerd exits with containerd
 2017-09-01 16:39:38 -07:00
Yongkun Anfernee Gui
5da08bd892 Fix build for multiple GOPATHs 
The build script doesn't work when people have GOPATH like
/path/a:/path/b

Signed-off-by: Yongkun Anfernee Gui <agui@vmware.com>
 2017-09-01 16:39:01 -07:00
Lantao Liu
7923171b2e Merge pull request #201 from Random-Liu/set-iptables 
Configure iptables to accept all TCP/UDP/ICMP packets.
 2017-09-01 16:31:25 -07:00
Lantao Liu
f7fd736a39 Merge pull request #159 from mikebrow/apparmor-feature 
Adds support for AppArmor
 2017-09-01 16:30:57 -07:00
Lantao Liu
c3e8c69aff Let cri-containerd exit with containerd 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-01 23:14:04 +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
Mike Brown
4f442de959 adds support for AppArmor 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-01 18:08:34 -05:00
Lantao Liu
4f449cec5f Merge pull request #202 from Random-Liu/fix-image-repo-digest 
Fix repo digest for schema 1 image.
 2017-09-01 16:01:05 -07:00
Lantao Liu
e6332a7d7f Configure iptables to accept all TCP/UDP/ICMP packets. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-01 22:59:20 +00:00
Kenfe-Mickaël Laventure
b4cc42d028 Merge pull request #1460 from mlaventure/pid-host-kill-init 
Ensure all init children are dead when it exits
 2017-09-01 15:17:40 -07:00
Kenfe-Mickael Laventure
939ad32117
Update go-runc to ba22f6a82e52be3be4eb4a00000fe816f4b41c2e 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickael Laventure
a6fb9bc111
reaper: Return an error if exit status is not 0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickael Laventure
92772bd471
linux: Ensure all init children are dead when it exits 
This ensure that when using the host pid, we don't let process alive,
preventing Wait() to return until they all die.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickael Laventure
9d251cbd1b
Delete bundle dir on restore if we're not debugging the shim 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickaël Laventure
d3e1132588 Merge pull request #1453 from crosbymichael/oom 
Convert oom metric to const
 2017-09-01 14:45:46 -07:00
Stephen Day
378e3343fe Merge pull request #1362 from AkihiroSuda/ctr-snapshot-info 
ctr: add `ctr snapshot info <key>`
 2017-09-01 14:25:25 -07:00
Lantao Liu
7121d251b0 Return image repo digest in container status. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-01 20:58:15 +00:00
Michael Crosby
b04e408a4b Convert OOM Metric to Const 
This converts the oom metric to be a const metric so that deleted tasks
do not fill up the metric labels.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-01 16:43:30 -04:00
Michael Crosby
93395c0b1d Merge pull request #1462 from stevvooe/fieldpath-fix 
service/containers: correctly plumb fieldpaths
 2017-09-01 16:30:57 -04:00
Stephen J Day
5cc108605f
service/containers: correctly plumb fieldpaths 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-01 13:17:31 -07:00
Derek McGowan
7182085551 Merge pull request #1447 from stevvooe/nice-events 
containerd: export Subscribe method on client
 2017-09-01 11:42:49 -07:00
Phil Estes
4291fb4803 Merge pull request #1454 from mlaventure/per-container-runtime-binary 
Per container runtime binary
 2017-09-01 13:25:17 -04:00
Phil Estes
a3f0bbaac1 Merge pull request #1459 from crosbymichael/exec-wait 
Wait on exec process not task
 2017-09-01 12:12:28 -04:00
Michael Crosby
5614e9c7b3 Wait on exec process not task 
Fixes #1449

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-01 11:51:45 -04:00
Michael Crosby
3e2a9c60af Merge pull request #1458 from AkihiroSuda/net-host 
ctr: net-host: bind-mount host /etc/{hosts,resolv.conf}
 2017-09-01 10:28:17 -04:00
Phil Estes
dd05301bef Merge pull request #1457 from AkihiroSuda/nit-doc 
RELEASES.md: Go API -> Go client API
 2017-09-01 10:00:23 -04:00
Lantao Liu
5057c2d4fb Merge pull request #197 from Random-Liu/not-remove-out-dated-tag 
Do not remove out dated image tag.
 2017-09-01 00:48:37 -07:00
Lantao Liu
cfb5513a54 Fix repo digest for schema 1 image. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-01 07:18:02 +00:00