github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,497 Commits 3 Branches 2 Tags 112 MiB
32f6e6c8aa
Commit Graph

11497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
0baecaa7cf Merge pull request #1439 from mlaventure/allow-setting-rutime-opts 
Allow setting runtime options when using WithRuntime()
 2017-08-30 15:59:14 -04:00
Lantao Liu
c4d95aa2c4 Fix sandbox container snapshotter. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-30 18:33:59 +00:00
Kenfe-Mickaël Laventure
49e3d43ff2 Merge pull request #1443 from crosbymichael/daemon-cgroup 
Place containerd inside cgroup
 2017-08-30 10:45:19 -07:00
Lantao Liu
2aea0388be Merge pull request #187 from Random-Liu/fix-bind-mount 
Use rbind and rprivate in bind mount.
 2017-08-30 10:16:59 -07:00
Lantao Liu
9478446de1 Merge pull request #189 from Random-Liu/update-cri-test 
Update cri validation test to add supplemental groups test.
 2017-08-30 10:15:43 -07:00
Lantao Liu
fd2a8c9701 Update cri validation test to add supplemental groups test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-30 06:02:21 +00:00
Lantao Liu
3f4978b77b Use rbind and rprivate in bind mount. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-30 01:40:03 +00:00
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
Michael Crosby
932246b575 Place containerd inside cgroup 
This adds a config option to place the `containerd` daemon process into
a cgroup so that proper resource usage and accounting can be applied.

It defaults to not being place inside a cgroup and will create a new
cgroup if the `path` does not exist in the config or join an existing
`path` if it already exists.

```toml
[cgroup]
    path = "/containerd"
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-29 15:00:27 -04:00
Michael Crosby
c3711c3866 Merge pull request #1319 from mlaventure/handle-sigkilled-shim 
Handle sigkilled shim
 2017-08-29 14:06:17 -04:00
Michael Crosby
744308a952 Merge pull request #1440 from mlaventure/fix-shim-panic 
Fix panic in CloseIO when not Stdin was allocated for a process
 2017-08-29 13:33:05 -04:00
Kenfe-Mickael Laventure
42b131c1f3
Allow setting runtime options when using WithRuntime() 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 10:03:51 -07:00
Kenfe-Mickael Laventure
1c92c0ecbf
Fix panic in CloseIO when not Stdin was allocated for a process 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 09:58:48 -07:00
Kenfe-Mickaël Laventure
456e1697ee Merge pull request #1438 from crosbymichael/apparmor 
Add default apparmor profile generation
 2017-08-29 09:55:34 -07:00
Phil Estes
7dd87c35ee Merge pull request #1436 from crosbymichael/security 
Add security mailing list to readme and releases
 2017-08-29 12:19:59 -04:00
Michael Crosby
2b46989dbe Add default apparmor profile generation 
This adds default apparmor profile generation to the containerd client
so that profiles can be generated with a SpecOpt

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-29 12:03:24 -04:00
Kenfe-Mickael Laventure
edd1da8591
Use configured runtime when cleaning up after dead shim 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
700120c066
Don't build binaries when running make vet 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
3f34c421d3
Add missing "/tasks/exec-started" event topic 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
dbd3eff1e6
containerd: add state flag to specify state dir 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
d541567119
Handle SIGKILL'ed shim while daemon is running 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
c23f29ebce
containerd-shim: Don't try to delete container twice 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
eb4abac9f7
linux: Prevent deadlock in reaper.WaitPid() 
A deadlock can occurs if `WaitPid()` is called twice before the process
dies.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
9923a49e97
linux/shim: Kill container upon SIG{TERM,KILL} 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Michael Crosby
6ec92ddbc9 Merge pull request #1437 from darrenstahlmsft/LCOWConfig 
LCOW: Split Windows and Linux HCS config generation
 2017-08-29 10:28:00 -04:00
Darren Stahl
d0b613665a Split Windows config generation to support LCOW 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-08-28 18:05:55 -07:00
Darren Stahl
4a782f7b54 Vendor opengcs and hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-08-28 15:07:51 -07:00
Michael Crosby
6b6ac8e9f0 Add security mailing list to readme and releases 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-28 17:17:50 -04: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
Michael Crosby
cf09e32618 Merge pull request #1435 from Random-Liu/with-process-kill-all 
WithProcessKill should kill all processes.
 2017-08-28 14:49:18 -04:00
Lantao Liu
2f237b2fde WithProcessKill should kill all processes. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-28 18:39:00 +00:00
Kenfe-Mickaël Laventure
31b5bb9107 Merge pull request #1434 from crosbymichael/kill-all 
Add KillOpts for killing all processes
 2017-08-28 11:07:12 -07:00
Michael Crosby
ed6b8fb0aa Add KillOpts for killing all processes 
Fixes #1431

This adds KillOpts so that a client can specify when they want to kill a
single process or all the processes inside a container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-28 13:29:47 -04: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
Michael Crosby
a19761874e Merge pull request #1428 from mlaventure/go1.9 
Use golang 1.9 on CI
 2017-08-28 10:56:28 -04:00
Michael Crosby
b9879d46f4 Merge pull request #1433 from Random-Liu/fix-with-user-id 
WithUserID should not return error when /etc/passwd doesn't exist.
 2017-08-28 10:10:41 -04: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
410bcea236 WithUserID should not return error when /etc/passwd doesn't exist. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-28 05:57:49 +00: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
Michael Crosby
360e46ddda Merge pull request #1429 from dmcgowan/client-use-root-path 
Use RootPath for resolving path inside of an image
 2017-08-25 16:23:28 -04:00
Derek McGowan
44e266b7a7
Use RootPath for resolving path inside of an image 
Prevents unintentional lookup of host passwd file

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-25 13:16:46 -07:00
Michael Crosby
e4a77fcc0a Merge pull request #1425 from Random-Liu/add-with-user-id 
Add WithUserID which gets uid and gid from image's /etc/passwd.
 2017-08-25 16:00:49 -04:00