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

4190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
c0a3b6e823
Merge pull request #2812 from tonistiigi/credential-nil-check 
remotes: avoid panic with default resolver conf
 2018-11-20 10:19:38 -05:00
Phil Estes
181a522142
Merge pull request #2807 from lifubang/shimlockwhenstdinclose 
fix pipe in broken may cause shim lock forever
 2018-11-20 22:38:22 +08:00
Phil Estes
1a62577719
Merge pull request #2811 from Random-Liu/lock-kill-all 
Lock `KillAll`.
 2018-11-20 22:36:30 +08:00
Tonis Tiigi
a2e8ab9ff7 remotes: avoid panic with default resolver conf 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-11-19 17:33:59 -08:00
Phil Estes
55baf50b5a
Merge pull request #2798 from lifubang/execd 
add flag -d for ctr t exec to run a service in container
 2018-11-20 08:34:29 +08:00
Lantao Liu
7d91d631e0 Lock KillAll. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-19 15:19:35 -08:00
Phil Estes
f801661dcf
Merge pull request #2809 from HusterWan/zr/octet-stream-fix 
refactor: no need so many defer in closeAll function
 2018-11-20 06:23:30 +08:00
Michael Wan
9639db5522 refactor: no need defer in closeAll 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-11-19 09:41:38 -05:00
Michael Crosby
aa537a67b3
Merge pull request #2797 from lifubang/createcmd 
change args usage for ctr c create
 2018-11-19 09:36:52 -05:00
Lifubang
e76a8879eb fix pipe in broken may cause shim lock forever for runtime v1 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-19 09:25:43 +08:00
Lifubang
b3438f7a6f fix pipe in broken may cause shim lock forever for runtime v2 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-19 09:02:49 +08:00
Akihiro Suda
e1383c3d23
Merge pull request #2799 from BSWANG/patch-1 
Add build requirement doc on fedora/centos
 2018-11-17 13:05:22 +09:00
Phil Estes
d8621e258c
Merge pull request #2800 from crosbymichael/revert-dropped 
Revert v2 dropped events
 2018-11-17 09:01:58 +08:00
Michael Crosby
d48d7464ad
Merge pull request #2773 from crosbymichael/state-locking 
Fix process locking and state management
 2018-11-16 14:15:04 -05:00
Michael Crosby
ee41ce3f8c
Merge pull request #2788 from crosbymichael/runc-bump 
Update runc to 10d38b660a77168360df3522881e2dc2be
 2018-11-16 12:39:47 -05:00
Michael Crosby
956e49a36b Revert v2 dropped events 
Partial revert of #2748

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-16 11:34:15 -05:00
Bingshen Wang
581a63ce4e Add build requirement doc on fedora/centos 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2018-11-16 18:53:15 +08:00
Lifubang
01f5aa3878 add flag -d for ctr t exec to run a service in container 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-16 14:29:45 +08:00
Lifubang
51ad4d3020 change args usage for ctr c create 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-16 14:09:39 +08:00
Phil Estes
44b90df286
Merge pull request #2794 from wk8/wk8/nvidia_kmods 
Adding a --load-kmods flag to the NVIDIA OCI hook
 2018-11-16 11:50:37 +08:00
Jean Rouge
90880078b9 Adding a --load-kmods flag to the NVIDIA OCI hook 
Signed-off-by: Jean Rouge <jer329@cornell.edu>
 2018-11-15 01:52:11 -08:00
Michael Crosby
e1a59ba0fb Update runc to 10d38b660a77168360df3522881e2dc2be 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-14 14:02:41 -05:00
Michael Crosby
a3c2f00c50
Merge pull request #2786 from jterry75/revendor_logrus 
Revendor github.com/sirupsen/logrus to v1.0.3
 2018-11-14 11:58:58 -05:00
Justin Terry (VM)
8e25ca6bf0 Revendor github.com/sirupsen/logrus to v1.0.3 
logrus v1.0.3 was the first release that include the change in
terminal_windows.go that stops exec'ing "cmd ver" to obtain the version
information and rather uses the x/sys/crypto/terminal.IsTerminal on the
console fd. On Windows this is a significant performance difference to
avoid the additional process activation of the "cmd ver" for each
invocation of the shim/runhcs executables.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-13 09:27:29 -08:00
Phil Estes
c7896bd722
Merge pull request #2775 from jterry75/vendor_hcsshim 
Revendor github.com/Microsoft/hcsshim
 2018-11-10 14:13:28 -05:00
Phil Estes
f0bedbbd32
Merge pull request #2776 from thaJeztah/ignore_modprobe_failures 
Ignore modprobe failures in ExecStartPre (systemd unit)
 2018-11-10 14:09:40 -05:00
Sebastiaan van Stijn
555ea3fb43
Ignore modprobe failures in ExecStartPre (systemd unit) 
When running containerd inside LXC, due to systemd being unable to execute
`modprobe overlay` inside the container (module is already loaded in host kernel).

This patch adds a `-` prefix to the `ExecStartPre` command, so that failures
are ignored, and the service can start as usual.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-11-10 12:52:06 +01:00
Justin Terry (VM)
abd971cfbd Revendor github.com/Microsoft/hcsshim 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-09 15:51:44 -08:00
Michael Crosby
96d30788e1
Merge pull request #2770 from Random-Liu/partial-revert-#2748 
Partially revert the event discard change in #2748.
 2018-11-09 15:57:33 -05:00
Michael Crosby
ed5a789889
Merge pull request #2771 from Ace-Tang/runtime_v2_add_id 
fix: fix failed to get container-shim relation with io.containerd.runc.v1
 2018-11-09 13:26:22 -05:00
Michael Crosby
831a41b958 Fix process locking and state management 
There were races with the way process states.  This displayed in ways,
especially around pausing the container for atomic operations.  Users
would get errors like, cannnot delete container in paused state and
such.

This can be eaisly reproduced with `docker` and the following command:

```bash
> (for i in `seq 1 25`; do id=$(docker create  alpine usleep 50000);docker start $id;docker commit $id;docker wait $id;docker rm $id; done)
```

This two issues that this fixes are:

* locks must be held by the owning process, not the state operations.
* If a container ends up being paused but before the operation
completes, the process exists, make sure we resume the container before
setting the the process as exited.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-09 11:40:37 -05:00
Ace-Tang
c4feaa75cf fix: fix failed to get container-shim relation with io.containerd.runc.v1 
add '-id' flag when start container with io.containerd.runc.v1 shim, or user
can not get container-shim relation from 'ps -ef',like

```
/usr/bin/containerd-shim-runc-v1 -namespace default -address
/run/containerd/containerd.sock -publish-binary /usr/bin/containerd
```

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-09 11:01:35 +08:00
Lantao Liu
c524b9ce41 Partially revert the event discard change in #2748. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-08 14:47:32 -08:00
Phil Estes
130d07edd2
Merge pull request #2769 from fuweid/shim_related_change 
enhance: update v1/v2 runtime
 2018-11-07 10:30:03 -05:00
Michael Crosby
8e6cf4fb52
Merge pull request #2766 from AkihiroSuda/doc-rootless 
Rootless mode
 2018-11-07 10:03:17 -05:00
Phil Estes
f0b081bb44
Merge pull request #2734 from Ace-Tang/start_early_error 
check task existence before new task
 2018-11-07 10:02:32 -05:00
Wei Fu
38d7d59e8a enhance: update v1/v2 runtime 
1. avoid dead lock during kill, fetch allProcesses before handle events
2. use argu's ctx instead of context.Backgroud() in openlog

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-11-06 22:48:43 +08:00
Akihiro Suda
ce6d4c9a9f add docs/rootless.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-11-06 17:39:30 +09:00
Akihiro Suda
dd0539b095 ctr: add --cgroup for oci.WithCgroup 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-11-06 17:39:30 +09:00
Michael Crosby
8dcabd6125
Merge pull request #2755 from estesp/add-adopters 
Add ADOPTERS.md file
 2018-11-05 16:40:01 -05:00
Michael Crosby
2a10bc7b44
Merge pull request #2759 from fuweid/bugfix_use_right_flag_value 
bugfix: use skip-verify flag not insecure in ctr
 2018-11-05 14:20:56 -05:00
Phil Estes
18363d0c95
Add ADOPTERS.md file 
Per request of the CNCF, adding known containerd adopters to GitHub
project.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-11-05 14:12:27 -05:00
Michael Crosby
0535fa60fb
Merge pull request #2756 from jterry75/runhcs_opts 
Implement io.containerd.runhcs.v1 runtime activation options
 2018-11-05 13:33:32 -05:00
Justin Terry (VM)
354dab0caa Forward ctr.exe --debug as io.containerd.runhcs.v1 options 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-05 09:08:48 -08:00
Justin Terry (VM)
a33ad40245 Implement io.containerd.runhcs.v1 shim log opts 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-05 09:08:48 -08:00
Justin Terry (VM)
ec3dbd155e Add io.containerd.runhcs.v1 shim proto options 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-05 09:08:48 -08:00
Justin Terry (VM)
7d70d2b78d Fix Makefile to run protobuild on paths with spaces 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-05 09:08:48 -08:00
Michael Crosby
998d0f9e49
Merge pull request #2761 from jterry75/remove_windows_v2_conditional 
Build Windows V1 and V2 runtimes always
 2018-11-05 11:56:34 -05:00
Phil Estes
37773e169d
Merge pull request #2764 from cyphar/emoji-remove 
makefile: remove emoji
 2018-11-05 09:32:27 -05:00
Aleksa Sarai
83f4ab8855
makefile: remove emoji on Linux 
These break the build on i386 in some very specific circumstances (where
/bin/sh breaks when handling unicode), and are completely useless when
it comes to actually building the project.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2018-11-05 23:09:14 +11:00