Commit Graph

4148 Commits

Author SHA1 Message Date
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
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
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
Michael Crosby
1301813f7a Update ZFS for unsupported warnings
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 13:52:32 -04:00
Michael Crosby
16aaf6c065 Change unsupported snapshot warnings to INFO
Since there is no real action the user can do, these can safely be
informative that the underlying filesystem does not support a snapshot
plugin at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 12:44:14 -04:00
Sebastiaan van Stijn
07237e34e6
Bump to Go 1.11.x
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-25 22:13:21 +02:00
Ace-Tang
c206da7957 optimize shim lock in runtime v1
apply lock only around process map of shim service, avoid lock affect
other procs operations.

Signed-off-by: Ace-Tang <aceapril@126.com>
2018-10-25 15:27:46 +08:00
Derek McGowan
c4446665cb
Merge pull request #2731 from dmcgowan/release-1.2
Prepare 1.2 release
2018-10-24 16:44:29 -07:00
Derek McGowan
e4d2486899
Prepare 1.2 release
Rename release notes to remove rc label.
Add 1.2 API description text file.
Update version.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-24 16:14:46 -07:00
Derek McGowan
c20c569a01
Merge pull request #2742 from fuweid/bugfix_return_context_cancel_error_during_subcribe
bugfix: return the context error during event subscribe
2018-10-24 16:13:41 -07:00
Wei Fu
15a761c035 bugfix: return the context error during event subscribe
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-24 19:25:57 +08:00
Phil Estes
9fb7eedb5b
Merge pull request #2729 from Ace-Tang/master
runtime-v2: add validation for runtime name
2018-10-23 16:39:51 +01:00
Michael Crosby
2f2d6a142c
Merge pull request #2741 from Random-Liu/update-cri
Update cri to f913714917d2456d7e65a0be84962b1ce8acb487.
2018-10-23 10:31:18 -04:00
Phil Estes
52893fbb05
Merge pull request #2740 from Ace-Tang/ctr_metric
ctr: fix potential panic in metric
2018-10-23 09:16:01 +01:00
Ace-Tang
c3cac72b92 ctr: fix potential panic in metric
Signed-off-by: Ace-Tang <aceapril@126.com>
2018-10-23 14:01:50 +08:00
Lantao Liu
bee4cc5929 Update cri to f913714917d2456d7e65a0be84962b1ce8acb487.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-22 22:57:25 -07:00
Michael Crosby
a4b6522e11
Merge pull request #2732 from gliptak/patch-1
Correct redundant nil check
2018-10-22 11:17:11 -04:00
Michael Crosby
6f1a54c952
Merge pull request #2736 from gliptak/misspell1
Misspell1
2018-10-22 10:38:46 -04:00
Akihiro Suda
d4529076f7
Merge pull request #2735 from estesp/remove-release-tool
Remove containerd-release tool from main repo
2018-10-20 16:43:41 +09:00
Gábor Lipták
9d01160902
Correct spelling
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
2018-10-19 17:06:43 -04:00
Gábor Lipták
4a0c40664a
Correct redundant nil check
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
2018-10-19 16:50:17 -04:00
Phil Estes
0dd3211a06
Remove containerd-release tool from main repo
The release-tool is now located in the `containerd/project` repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-19 12:13:38 -04:00
Ace-Tang
7b1b16b741 runtime-v2: add validation for runtime name
add validation for runtime name, if runtime name is invalid,
containerd will got panic.

Signed-off-by: Ace-Tang <aceapril@126.com>
2018-10-19 15:19:45 +08:00
Akihiro Suda
133ac5cd2a
Merge pull request #2730 from fuweid/fixtypo_in_runtime_package
fixtypo: misspell in runtime package
2018-10-19 10:23:54 +09:00
Derek McGowan
405518591d
Merge pull request #2727 from mikebrow/ignore-idempotence
allow idempotence when adding a task to cgroup metrics collection
2018-10-18 11:16:41 -07:00
Wei Fu
accadd7118 fixtypo: misspell in runtime package
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-18 23:21:05 +08:00
Mike Brown
879b2ae291 allow idempotence when adding a task to cgroup metrics collection
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-10-18 01:32:56 -05:00