Commit Graph

4172 Commits

Author SHA1 Message Date
Evan Hazlett
40caece8dc update tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:47:17 +00:00
Evan Hazlett
4fdf720b84 move rw to opt; make snapshot opt; move to NewContainerOpts
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:47:17 +00:00
Evan Hazlett
147208061c add image name and runtime name media types; remove task operation on checkpoint
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:47:17 +00:00
Evan Hazlett
ce0673fd7d Restore take image
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:47:17 +00:00
Evan Hazlett
0e4d9da755 remove task handling from Restore
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:47:16 +00:00
Evan Hazlett
2d3db08daf refactor spec and snapshot restore into opts
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:45:22 +00:00
Evan Hazlett
45c700a955 refactor checkpoint and restore to client
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-11-12 11:45:22 +00: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
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
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
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
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
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
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
Michael Crosby
6f8edc2308
Merge pull request #2743 from Ace-Tang/shim_lock
bugfix: optimize shim lock in runtime v1 avoid dead lock
2018-10-29 11:25:01 -04:00
Phil Estes
05f8c3a3f1
Merge pull request #2746 from crosbymichael/aufs-bump
Bump aufs for unsupported errors
2018-10-29 10:15:40 -04:00
Wei Fu
00ba92364c bugfix: CloseIO should return correct status code
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-28 12:08:59 +08:00
Michael Crosby
1cc93460d7 Bump aufs for unsupported errors
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 16:49:48 -04:00
Michael Crosby
7f8b405eac
Merge pull request #2745 from crosbymichael/snapshot-warnings
Change unsupported snapshot warnings to INFO
2018-10-26 15:22:04 -04:00
Michael Crosby
86b8c480c8
Merge pull request #2435 from thaJeztah/bump_go_1.11
Bump to Go 1.11.0
2018-10-26 15:09:02 -04:00