github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
5,191 Commits 3 Branches 2 Tags 112 MiB
57b51b9481
Commit Graph

5191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
3a3f0aac88
Merge pull request #3241 from tonistiigi/differ-close 
differ: fix deadlock on commit error
 2019-04-26 15:02:38 +09:00
Sebastiaan van Stijn
e5aab17a0e
bump opencontainers/selinux v1.2.2 
full diff: https://github.com/opencontainers/selinux/compare/v1.2.1...v1.2.2

- opencontainers/selinux#51 Older kernels do not support keyring labeling

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-25 22:43:05 -07:00
Sebastiaan van Stijn
dd85aea625
bump runc v1.0.0-rc8 
full diff: 029124da7a...425e105d5a

- opencontainers/runc#2043 Vendor in latest selinux code for keycreate errors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-25 22:42:50 -07:00
Tonis Tiigi
5b9bd993a8 differ: fix deadlock on commit error 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2019-04-25 17:50:17 -07:00
Phil Estes
810b3c37bb
Merge pull request #3239 from sipsma/nosetuplog 
Support disabling default setup of shim logger.
 2019-04-25 17:48:11 -04:00
Erik Sipsma
48f46516ad Support disabling default setup of shim logger. 
Before this change, the v2 runtime shim setup code was hardcoded to always
configure logrus to write logs to the "log" FIFO present in the current working
directory. This only happens in the "default" action codepath
(i.e. not shim start or shim delete).

This is problematic for shims that execute outside the current working
directory of a bundle. For example, it often doesn't make sense for shims that
manage multiple containers to execute in a single bundle directory. Additionally,
shim processes that require being pre-created, i.e. spun up before tasks they
will handle are actually created, won't have a log FIFO to write to until a task
is created.

This change leaves the default behavior as is but introduces a Binary Config
field that will optionally disable automatic configuration of logrus to use the
"log" FIFO. This allows shims to configure their own logger if necessary while
still re-using the rest of the shim helper code in containerd.

Signed-off-by: Erik Sipsma <sipsma@amazon.com>
 2019-04-24 19:01:12 +00:00
Michael Crosby
2d780a7a60
Merge pull request #3237 from thaJeztah/bump_go_units 
bump docker/go-units v0.4.0
 2019-04-23 17:07:13 -04:00
Sebastiaan van Stijn
c79c7921c0
bump docker/go-units v0.4.0 
relevant changes:

- docker/go-units#19 make 1 second not to be plural seconds
- docker/go-units#20 Add `HumanSizeWithPrecision` function
- docker/go-units#21 change week display rule
- docker/go-units#22 Better human duration precision
- docker/go-units#23 Removes spaces before unit
- docker/go-units#27 Fix #26 - RAMInBytes Bug
- docker/go-units#33 Fix handling of unlimited (-1) ulimit values
- docker/go-units#34 Revert 46 minute threshold

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-23 17:07:58 +02:00
Ace-Tang
dfa51c9279 runtime-v1: kill shim in cleanupAfterDeadShim 
1. kill shim in cleanupAfterDeadShim avoid shim leak
2. refactor cleanupAfterDeadShim, get pid from bundle
path instead of make pid as a parameter

Signed-off-by: Ace-Tang <aceapril@126.com>
 2019-04-22 14:29:40 +08:00
Phil Estes
835e6d01fb
Merge pull request #3231 from kevpar/dump-stacks-to-file 
Don't write dumped stacks to file for ETW capture state
 2019-04-19 13:43:49 -04:00
Kevin Parsons
0376dd4605 Don't write dumped stacks to file for ETW capture state 
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-04-19 10:11:24 -07:00
Phil Estes
c2fb5d73f9
Merge pull request #3230 from jterry75/fix_windows_image 
Convert Windows CI to use Microsoft MCR image urls
 2019-04-19 09:32:38 -04:00
Justin Terry (VM)
e6fc0ed22d Convert Windows CI to use Microsoft MCR image urls 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-04-18 16:07:00 -07:00
Michael Crosby
a91e04356d
Merge pull request #3223 from thaJeztah/bump_gocapability 
Bump syndtr/gocapability d983527, containerd/console
 2019-04-18 15:26:34 -04:00
Phil Estes
ffe0b6927b
Merge pull request #3190 from jhowardmsft/jjh/stack2file 
Write stack dump to `os.TempDir()` as well
 2019-04-18 14:43:25 -04:00
Phil Estes
a905b0f0af
Merge pull request #3224 from thaJeztah/bump_crypto 
Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
 2019-04-18 13:52:39 -04:00
Sebastiaan van Stijn
06a3a480cc
bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-18 19:45:38 +02:00
Sebastiaan van Stijn
a333dbcfb4
Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3 
full diff: 49796115aa...88737f569e

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-18 19:01:11 +02:00
Sebastiaan van Stijn
0fd02564a2
bump gocapability 
full diff: db04d3cc01...d98352740c

changes included:

  - syndtr/gocapability#14 capability: Deprecate NewPid and NewFile for NewPid2 and NewFile2
  - syndtr/gocapability#16 Fix capHeader.pid type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-18 19:00:27 +02:00
John Howard
7718d060eb Write stack dump to os.TempDir() as well 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2019-04-18 09:26:11 -07:00
Michael Crosby
b819d05fd0
Merge pull request #3222 from estesp/test-appveyor 
Update to sha-specific nanoserver image reference to fix AppVeyor CI runs
 2019-04-18 11:08:25 -04:00
Wei Fu
a4942ca4fe
Fix error on pull hang in CI 
Kill the underlying containerd after outputting error. Otherwise CI
hangs indefinitely and requires the CI infrastructure to kill the build
at the timeout expiration.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-04-18 10:24:15 -04:00
Phil Estes
6bcf463b01
Move to sha-specified test image for nanoserver 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-04-18 10:02:04 -04:00
Michael Crosby
56d8a05808
Merge pull request #3220 from AkihiroSuda/akihirosuda-email 
.maimap: update Akihiro Suda's email address
 2019-04-17 15:06:31 -04:00
Akihiro Suda
cfb8b5573a .mailmap: update Akihiro Suda's email address 
No affiliation change (NTT).

The former email address will continue to be available for the time being.

For daily communication, I still prefer to use my gmail.com address.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-04-17 18:35:35 +09:00
Phil Estes
4c16017e2f
Merge pull request #3209 from Random-Liu/fix-v1-shim-cleanup 
Shim v1: Check task list to avoid unnecessary cleanup.
 2019-04-16 15:39:53 -04:00
Michael Crosby
8722ec03c3
Merge pull request #3213 from jcordasc/small-fixes 
Correct import path and PusherFunc signature
 2019-04-16 15:32:51 -04:00
Michael Crosby
665715b8a6
Merge pull request #3208 from mxpv/client 
Allow reuse client for external GRPC services
 2019-04-16 15:30:33 -04:00
Maksym Pavlenko
be2cbd0b2d Access to client's GRPC connection object 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-04-16 10:19:32 -07:00
John Howard
cc73dc3dbd
Merge pull request #3217 from kevpar/etw-capture-state 
Enable dumping Goroutine stacks via ETW capture state
 2019-04-15 14:19:46 -07:00
Kevin Parsons
78f3dc433c Allow dumping stacks via ETW capture state 
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-04-15 13:35:35 -07:00
Kevin Parsons
05dd66b2e6 Update go-winio in vendor.conf 
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-04-15 13:34:57 -07:00
Phil Estes
396eba1b23
Merge pull request #3216 from thaJeztah/bump_mistify_zfs 
bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
 2019-04-15 15:44:15 -04:00
Sebastiaan van Stijn
c9059c7673
bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb 
- mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-14 13:31:22 +02:00
Michael Crosby
32e788a8be
Merge pull request #3205 from Random-Liu/test-runtime-for-cri 
Use $TEST_RUNTIME for cri test.
 2019-04-12 13:51:53 -04:00
Phil Estes
906e8bc7dc
Merge pull request #3207 from crosbymichael/ttrpc-deps 
Requeue events in the ttrpc publisher
 2019-04-12 17:54:12 +01:00
Michael Crosby
63c7a879b6 Requeue events in the shim publisher 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-12 11:57:20 -04:00
Jared Cordasco
fc167f9578 Correct PusherFunc helper to match Pusher intf 
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-04-12 09:12:55 -05:00
Jared Cordasco
a7af3c13a5 Correct import path in services/server package 
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-04-11 23:07:46 -05:00
Lantao Liu
9cc58781fa Check task list to avoid unnecessary cleanup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-11 16:29:09 -07:00
Michael Crosby
97d247cd0f Rename hrpc to tcpServer 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-11 15:06:06 -04:00
Derek McGowan
5f4c977ba0
Merge pull request #3162 from crosbymichael/tcpservice 
Add tcp service for grpc listeners
 2019-04-11 11:55:00 -07:00
Derek McGowan
ff90b036c7
Merge pull request #3202 from crosbymichael/nofile 
Set nofile to 1048576
 2019-04-11 11:47:57 -07:00
Derek McGowan
acca107732
Merge pull request #3204 from crosbymichael/fix-forward 
Fix API forward events for shims
 2019-04-11 11:46:46 -07:00
Michael Crosby
047348e198 Add dialer for events service 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-11 12:01:52 -04:00
Phil Estes
5703f415c6
Merge pull request #3197 from Random-Liu/add-required-plugins 
Add support for required plugins.
 2019-04-11 12:02:16 +02:00
Michael Crosby
ae87730ad2 Improve shim shutdown logic 
Shims no longer call `os.Exit` but close the context on shutdown so that
events and other resources have hit the `defer`s.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-10 18:17:07 -04:00
Lantao Liu
a12f836d5a Use $TEST_RUNTIME for cri test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-10 14:11:03 -07:00
Lantao Liu
4b3b99ea11 Add support for required plugins. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-10 11:31:59 -07:00
Michael Crosby
4ba756edda Fix API forward events for shims 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-04-10 13:34:34 -04:00