Wei Fu
111b082e20
Merge pull request #3356 from mxpv/binary-io-path
...
BinaryIO/LogFile creator bug fixing
2019-06-20 10:25:47 +08:00
Maksym Pavlenko
fbf96d302a
Fix path in LogFile creator
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-06-19 16:53:33 -07:00
Michael Crosby
7ac57b6392
Merge pull request #3357 from odinuge/dependency-cgroups
...
Update dependency containerd/cgroups
2019-06-19 16:43:35 -04:00
Eric Hotinger
63a8dee60d
Switch to GitHub's new issue templates.
...
Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
2019-06-19 12:28:24 -07:00
Odin Ugedal
341c7c144f
Update dependency containerd/cgroups
...
Signed-off-by: Odin Ugedal <odin@ugedal.com>
2019-06-19 21:19:00 +02:00
Michael Crosby
8bb521318a
Merge pull request #3055 from ehotinger/ehotinger/flow-opts
...
Allow opts to flow to the backend snapshotter during snapshot creation.
2019-06-19 14:54:36 -04:00
Maksym Pavlenko
5e0d793801
Fix bugs in BinaryIO creator
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-06-19 11:15:17 -07:00
Eric Hotinger
75f183887a
Allow opts to flow to the backend snapshotter during snapshot creation.
...
Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
2019-06-19 11:00:22 -07:00
Phil Estes
4355a2accc
Merge pull request #3355 from Ace-Tang/avoid-start-hang
...
Add timeout in load shim v2
2019-06-19 11:29:27 +01:00
Ace-Tang
95f9bbf18b
Add timeout in load shim v2
...
add timeout in connect shim v2 avoid starting containerd hang
Signed-off-by: Ace-Tang <aceapril@126.com>
2019-06-19 13:10:18 +08:00
Michael Crosby
434f69e790
Merge pull request #3353 from mikebrow/fix-slack-invite
...
switch to a working link
2019-06-18 11:33:41 -04:00
Mike Brown
62e9e11696
switch to a working link
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2019-06-18 09:53:43 -05:00
Justin
3e7c6f6a6b
Merge pull request #3352 from crosbymichael/sn-panic
...
Fix snapshotter getter in client code
2019-06-17 11:05:11 -07:00
Michael Crosby
41e1bb8328
Fix snapshotter getter in client code
...
Fixes #3312
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-17 16:57:48 +00:00
Akihiro Suda
cbb108e228
Merge pull request #3348 from mxpv/new-binary-io
...
Make newBinaryIO public
2019-06-16 21:47:56 +02:00
Phil Estes
062d056196
Merge pull request #3345 from crosbymichael/diff-panic
...
Ensure labels is not nil in differ
2019-06-14 11:43:18 -04:00
Michael Crosby
052551573d
Ensure labels is not nil in differ
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-14 15:20:32 +00:00
Phil Estes
50cd49d1c8
Merge pull request #3343 from thaJeztah/appveyor_bump_go_1.12
...
AppVeyor: Bump golang 1.12.6
2019-06-14 10:27:25 -04:00
Sebastiaan van Stijn
67cf9f7f02
AppVeyor: Bump golang 1.12.6
...
go1.12.6 (released 2019/06/11) includes fixes to the compiler, the linker,
the go command, and the crypto/x509, net/http, and os packages. See the
Go 1.12.6 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.12.6
full diff: https://github.com/golang/go/compare/go1.12.5...go1.12.6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-14 15:58:28 +02:00
Justin
fe58b496bb
Merge pull request #3341 from crosbymichael/ttrpcmd
...
Update ttrpc for interceptors, closure, and metadata
2019-06-13 16:46:27 -07:00
Michael Crosby
0b7abc02b2
ttrpc updates for interceptors, close, and metadata
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-13 19:09:07 +00:00
Phil Estes
40b17e97f6
Merge pull request #3218 from fuweid/me-cross-push
...
remotes: support cross-repo-push
2019-06-13 09:42:00 -04:00
Phil Estes
667195fdd9
Merge pull request #3339 from YLonely/typo-fix
...
docs: Fix typo to some markdown files in /docs.
2019-06-13 08:34:05 -04:00
BoWen Yan
d15a06b190
docs: Fix typo to some markdown files in /docs.
...
Signed-off-by: BoWen Yan <loneybw@gmail.com>
2019-06-13 15:29:12 +08:00
Wei Fu
dd7c0aabcc
remotes: support cross-repo-push
...
With distribution source label in content store, select the longest
common prefix components as condidate mount blob source and try to push
with mount blob.
Fix #2964
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-06-13 09:51:46 +08:00
Maksym Pavlenko
bca5667362
Make newBinaryIO public
...
Allow third-party runtime implementations to reuse NewBinaryIO
in order to support pluggable shim logging binary protocol.
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-06-12 16:22:10 -07:00
Phil Estes
545e79ae11
Merge pull request #3337 from crosbymichael/config-bk
...
Fix backwards compat with v2 containerd configs
2019-06-11 21:08:15 -04:00
Michael Crosby
31afff2944
Fix backwards compat with v2 containerd configs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-11 23:44:39 +00:00
Michael Crosby
53896d7820
Merge pull request #3335 from dmcgowan/fix-user-agent
...
Add user agent header to all requests
2019-06-11 12:57:21 -04:00
Derek McGowan
bb00872800
Add user agent header to all requests
...
Currently the user agent is only being used on the initial
resolve request, then switching to the default user agent.
This ensures the correct user agent is always used. There is
a larger fix in progress which does this is a cleaner way, but
the scope of this change is fixing the user agent issue.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-06-11 22:57:58 +08:00
Wei Fu
2f69be5594
Merge pull request #3322 from crosbymichael/configs
...
Add v2 server config support with plugin URIs
2019-06-11 09:56:08 +08:00
Michael Crosby
9547d269a1
Add v2 server config support with plugin URIs
...
Closes #3210
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-10 17:54:20 +00:00
Michael Crosby
42f4bb98ac
Merge pull request #3311 from jing-rui/shimlog
...
fix shim std logs not close after shim exit
2019-06-10 12:05:35 -04:00
Michael Crosby
94a21fc9cf
Merge pull request #3328 from carlosedp/riscv64
...
Update x/sys, x/net and bbolt modules to support Risc-V architecture
2019-06-10 12:04:14 -04:00
Jing Rui
9e0cd529d3
fix shim std logs not close after shim exit
...
Signed-off-by: Jing Rui <jingrui@huawei.com>
2019-06-10 11:50:07 +08:00
CarlosEDP
fb6b0ae4c6
Update x/sys, x/net and bbolt modules to support Risc-V
...
Signed-off-by: CarlosEDP <me@carlosedp.com>
2019-06-07 17:54:32 -03:00
Wei Fu
02ed02eca5
Merge pull request #3325 from crosbymichael/unmount
...
Unmount rootfs with separate Remove() in bundle
2019-06-06 11:50:03 +08:00
Michael Crosby
ed308ea1e6
Unmount rootfs with separate Remove() in bundle
...
This ensures that a container does not have a mounted rootfs in the
bundle directory before RemoveAll is called. Having the rootfs removed
first with a Remove ensures that the directory is not mounted and empty
before the bundle directory is removed.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-05 20:37:35 +00:00
Michael Crosby
40f54dc076
Merge pull request #3324 from crosbymichael/content-close
...
Ensure close in content test
2019-06-05 16:37:05 -04:00
Michael Crosby
cf7fb14efa
Update timestamp atomic write
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-05 19:34:55 +00:00
Michael Crosby
4f6ba8286d
Ensure close in content test
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-04 19:26:34 +00:00
Phil Estes
04e7747e29
Merge pull request #3321 from crosbymichael/ttrpc-namespace
...
Update ttrpc for metadata and namespace support
2019-06-04 13:46:51 -04:00
Phil Estes
15ae6b74fd
Merge pull request #3318 from hinshun/ignore-readat-eof
...
Ignore EOF from ReadAt in content.ReadBlob
2019-06-04 13:46:32 -04:00
Edgar Lee
faf925ba25
Handle EOF from ReadAt in content.ReadBlob
...
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2019-06-04 10:18:36 -07:00
Michael Crosby
fa6a9f0635
Add ttrpc namespace support
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-04 15:21:10 +00:00
Michael Crosby
42f24b57e4
Update ttrpc to a5bd8ce9e40bc7c065a11c6936f4d032ce
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-04 15:14:06 +00:00
Wei Fu
faa5f55189
Merge pull request #3302 from crosbymichael/mkroot
...
Ensure that the rootfs dir is created in the bundle
2019-06-04 09:24:47 +08:00
Michael Crosby
d4e7efbb93
Merge pull request #3304 from fuweid/me-update-lease
...
leases: support resource management
2019-06-03 16:43:34 -04:00
Michael Crosby
7531c66d5a
Ensure that the rootfs dir is created in the bundle
...
This fixes issues running gvisor on top of containerd without docker.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-03 19:56:19 +00:00
Michael Crosby
7451dd1a48
Merge pull request #3308 from jterry75/handle_grpc_context_error
...
Add support to gRPC errdefs for context cancel/deadline exceeded
2019-06-03 15:35:00 -04:00