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

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickael Laventure
709ba260de
linux: Ensure shim is killed if we can't connect to it initially 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
5922cfaba8
linux: Bubble up runc error message 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
33598cc5d3
linux: Wrap error with contextual message 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
171759a233
linux: Return grpc error description only 
This avoid having "rpc error: code = Unknown" in the final output.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Derek McGowan
3a226ef17d
Update logic to determine if layer is empty 
Handle reliance on the size field when the throwaway field is not used.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 10:07:40 -07:00
Derek McGowan
9f90d8a9b4
Add schema1 conversion on pull 
closes #851

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 10:07:39 -07:00
Michael Crosby
7dbf26ecf6 Merge pull request #1001 from ijc/nuke-getTempDir 
ctr: Remove getTempDir
 2017-06-14 09:06:29 -07:00
Ian Campbell
e9559c6eed ctr: Remove getTempDir 
It is unused since 4c1af8fdd8 ("Port ctr to use client") and leaving it
around will just tempt people into writing code with security holes.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-14 15:30:11 +01:00
Akihiro Suda
e4bc59a295 package for manipulating OCI images 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-14 06:49:56 +00:00
Lantao Liu
2ae22b33b7 Fix a race that fake execution client sends event to closed channel. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-14 01:50:33 +00:00
Lantao Liu
bd09d31777 Fix Delete race. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-14 01:36:21 +00:00
Lantao Liu
7050011faa Merge pull request #75 from Random-Liu/kill-with-0-timeout 
Kill container directly if timeout is 0.
 2017-06-13 15:41:01 -07:00
Phil Estes
4576979244 Merge pull request #997 from stevvooe/no-image-container 
containerd: allow containers without an image
 2017-06-13 16:26:04 -04:00
Lantao Liu
d381cfa831 Kill container directly if timeout is 0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-13 19:29:02 +00:00
Stephen J Day
27af417668
containerd: allow containers without an image 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-13 11:23:53 -07:00
Lantao Liu
b83270d08d Merge pull request #74 from Random-Liu/fix-event-handler 
Add the missing loop in event handler.
 2017-06-13 11:19:16 -07:00
Lantao Liu
87ec0f89bf Add the missing loop in event handler. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-13 17:48:28 +00:00
Stephen Day
4d44b9358e Merge pull request #988 from dmcgowan/client-default-namespace 
Add default namespace to client
 2017-06-12 16:24:28 -07:00
Michael Crosby
2e048ec589 Merge pull request #965 from dmcgowan/content-read-at 
Update push to use copy
 2017-06-12 16:19:53 -07:00
Derek McGowan
e67c6be052
Add default namespace to client 
Adds a default namespace to the client.
Intercepts client requests to add namespace to context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-12 15:47:58 -07:00
Lantao Liu
479e8c3045 Merge pull request #70 from Random-Liu/mount-cgroup 
Mount cgroup into the container and add unit test for privileged mount.
 2017-06-12 14:14:07 -07:00
Michael Crosby
9226143b16 Merge pull request #978 from crosbymichael/process-delete 
Add DeleteProcess API for removing execs
 2017-06-12 10:00:12 -07:00
Kenfe-Mickaël Laventure
64e83bab10 Merge pull request #991 from crosbymichael/test-name 
Use t.Name() for container ids in tests
 2017-06-12 09:40:58 -07:00
Lantao Liu
9b1708b408 Merge pull request #71 from Random-Liu/fix-capabilities 
Fix capabilities support.
 2017-06-12 09:34:48 -07:00
Michael Crosby
ff598449d1 Add DeleteProcess API for removing execs 
We need a separate API for handing the exit status and deletion of
Exec'd processes to make sure they are properly cleaned up within the
shim and daemon.

Fixes #973

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-12 09:32:23 -07:00
Michael Crosby
be5da790a3 Use t.Name() for container ids in tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-12 09:27:17 -07:00
Lantao Liu
f247a0819d Fix capabilities support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-12 16:18:50 +00:00
Lantao Liu
fa28558824 Merge pull request #67 from Random-Liu/add-sandbox-dev-shm 
Add sandbox dev shm
 2017-06-11 02:58:24 -07:00
Lantao Liu
9d5990fe4f Add sandbox /dev/shm. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-11 09:49:46 +00:00
Lantao Liu
5398a3b7ec Add mount/unmount in os interface 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-11 09:23:04 +00:00
Lantao Liu
ffa4ffe3bf Mount cgroup into the container and add unit test for privileged mount. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-11 02:23:59 +00:00
Lantao Liu
e9a930b28b Merge pull request #51 from heartlock/support-privileged 
Support privileged
 2017-06-10 17:30:57 -07:00
Qiang Huang
4e8548cd3f Merge pull request #987 from crosbymichael/report-jun9 
Add dev report for june 9th
 2017-06-10 21:48:25 +08:00
Michael Crosby
7fb4c6d185 Add dev report for june 9th 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 16:33:36 -07:00
Michael Crosby
cf602e3aac Merge pull request #979 from dmcgowan/content-upload-lock-fix 
Replace lockfile with reference lock
 2017-06-09 15:02:57 -07:00
Stephen Day
7759386675 Merge pull request #986 from estesp/non-block-grpc-dist 
Don't use WithBlock() on `dist` gRPC connection
 2017-06-09 13:59:32 -07:00
Phil Estes
9f028b50cb
Don't use WithBlock() on dist gRPC connection 
When using WithBlock() on the dialer, the connection timeout must fully
expire before any status is provided to the user about whether they can
even connect to the socket. For example, if the containerd socket is
root-owned and the user tries `dist images ls` without `sudo`, the
default is 30 sec. of "hang" before the command returns.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-06-09 15:40:14 -04:00
Michael Crosby
beaff3d81d Merge pull request #985 from samuelkarp/task-delete-nil-check 
containerd: nil-check before calling io.Close
 2017-06-09 11:31:04 -07:00
Michael Crosby
c45dae71db Merge pull request #983 from tonistiigi/fix-ctx-imports 
Fix context package imports
 2017-06-09 11:23:49 -07:00
Samuel Karp
779efbce6a containerd: nil-check before calling io.Close 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2017-06-09 11:21:40 -07:00
Derek McGowan
6c91ee2dac Merge pull request #980 from crosbymichael/service-tasks 
Namespace tasks within runtime
 2017-06-09 11:02:33 -07:00
Tonis Tiigi
39d55cc498 Fix context package imports 
Conflicting with definition of plugin.Differ

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-09 10:58:29 -07:00
Michael Crosby
588c11852b Move task list to runtimes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 10:37:33 -07:00
Michael Crosby
a40f307e88 Namespace cgroups monitor ids 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 10:35:17 -07:00
Michael Crosby
745398b2e9 Remove tasks map from service 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 10:35:17 -07:00
Derek McGowan
3c4e2a36dc Merge pull request #976 from crosbymichael/attach 
Add `ctr attach` for reattaching to running task
 2017-06-09 10:19:18 -07:00
Michael Crosby
5d1669bcfb Add ctr attach for reattaching to running task 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 10:10:39 -07:00
Lantao Liu
227dbe97f2 Merge pull request #50 from Crazykev/resolv 
Generate and maintain resolv.conf for sandbox
 2017-06-09 09:41:23 -07:00
Crazykev
62d1e5dc10 add unit test 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
 2017-06-09 19:36:30 +08:00
Crazykev
9bf7ffd51a generate and maintain resolv.conf for sandbox 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
 2017-06-09 19:36:30 +08:00