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

10590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Brown
64b067d93f fix integration test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-11-08 17:53:47 -06: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
Mike Brown
bc97f51477 adds golang 1.11.x and tip to build 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-11-08 09:11:43 -06:00
Lantao Liu
edf2b81778
Merge pull request #969 from Random-Liu/golang-1.11-gofmt 
Update code for golang 1.11 gofmt.
 2018-11-08 00:21:04 -08:00
Lantao Liu
459e481808 Update code for golang 1.11 gofmt. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-07 16:08:58 -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
Lantao Liu
547b5e03cf
Merge pull request #967 from Random-Liu/update-support-metrics 
Update support metrics to include containerd 1.2.
 2018-11-05 17:09:23 -08:00
Lantao Liu
20b45be294 Update support metrics to include containerd 1.2. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-05 13:40:16 -08: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
Justin Terry (VM)
8329a491b9 Build Windows V1 and V2 runtimes always 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-02 11:59:03 -07:00
Ace-Tang
124194b98b check task existence before new task 
make user know correct error when new task.

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-03 02:55:12 +08:00
Wei Fu
a02f7cea86 bugfix: use skip-verify flag in ctr instead of insecure 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-11-02 23:51:37 +08:00
Michael Crosby
f1a3a6fba6
Merge pull request #2760 from estesp/fix-appveyor-mingw-vers 
Fix mingw version back to working version with Golang
 2018-11-02 11:21:57 -04:00
Phil Estes
2bb7da8431
Fix mingw version back to working version with Golang 
Appveyor choco install updated to a newer version of mingw which at the
moment is breaking Golang 1.11 compiles.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-11-02 09:15:51 -04:00
Lantao Liu
3fd67d108a
Merge pull request #965 from mikebrow/update-community-link 
update the slack information
 2018-11-01 15:19:06 -07:00
Charles Kenney
068880ff16 Add custom headers option to dockerResolver 
Signed-off-by: Charles Kenney <charlesc.kenney@gmail.com>
 2018-10-31 19:42:42 -04:00
Michael Crosby
b043f9ffad
Merge pull request #2754 from mikebrow/readme-slack-invite-update 
update link for slack invite
 2018-10-31 14:37:56 -04:00
Mike Brown
d8d7dcc759 update the slack information 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-10-31 13:07:09 -05:00
Mike Brown
fa912a79bb update link for slack invite 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-10-31 12:58:50 -05:00
Michael Crosby
9035063a5b
Merge pull request #2753 from Charliekenney23/fix-typo-resolveroptions-docs 
fix typo in ResolverOptions.Credentials documentation
 2018-10-31 13:28:14 -04:00
Charles Kenney
7c85d873a0 fix typo in ResolverOptions.Credentials documentation 
Signed-off-by: Charles Kenney <charlesc.kenney@gmail.com>
 2018-10-31 11:06:28 -04:00
Lantao Liu
f6089b85a7
Merge pull request #961 from mikebrow/remove-authconfig-fromlog 
removes authconfig from info log
 2018-10-30 00:31:01 -07:00
Lantao Liu
0e522cae43
Merge pull request #959 from Random-Liu/use-commit 
Use commit as version.
 2018-10-30 00:30:44 -07:00
Mike Brown
1b3ff7462e removes authconfit from info log 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-10-29 21:17:15 -05:00
Lantao Liu
7a1311698c Use commit as version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-29 18:13:33 -07:00
Michael Crosby
8afcade1a6
Merge pull request #2748 from crosbymichael/reaper-buffer 
Increase reaper buffer size and non-blocking send
 2018-10-29 17:49:50 -04:00
Lantao Liu
9f87ce8c7e
Merge pull request #957 from mikebrow/update-readme-link 
link to new icon location
 2018-10-29 14:20:12 -07:00
Michael Crosby
232a063496 Increase reaper buffer size and non-blocking send 
Fixes #2709

This increases the buffer size for process exit subscribers. It also
implements a non-blocking send on the subscriber channel.  It is better
to drop an exit even than it is to block a shim for one slow subscriber.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-10-29 16:46:58 -04:00
Michael Crosby
35a32a8778
Merge pull request #2747 from fuweid/bugfix_wrap_error_in_closeIO 
bugfix: CloseIO should return correct status code
 2018-10-29 11:25:37 -04:00