github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,015 Commits 3 Branches 4 Tags
45df696bf3fe3eda15bbf0f2c00ddc2cfeddcdcc
Commit Graph

9015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
db028fd208 Merge pull request #803 from Random-Liu/select-ipv4-first 
Select ipv4 first if there is one.
 2018-06-05 12:45:38 -07:00
Bin Du
9b865d86a9 docker/pusher: handle location string containing path and query 
Signed-off-by: Bin Du <bindu@microsoft.com>
 2018-06-05 19:25:19 +00:00
Lantao Liu
83e6b65566 Select ipv4 first if there is one. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 18:25:03 +00:00
Lantao Liu
ccc5f394f7 Remove unused files. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 17:34:26 +00:00
Phil Estes
081b2d6330 Merge pull request #2384 from crosbymichael/bump-console 
Bump console for windows tty handling
 2018-06-05 18:32:00 +03:00
Michael Crosby
0cfca1e633 Bump console for windows tty handling 
ref: https://github.com/containerd/console/pull/25

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-06-05 10:14:41 -04:00
Michael Crosby
0d7fd3f7ad Merge pull request #2383 from AkihiroSuda/vendor-cri-20180605 
update cri vendor
 2018-06-05 09:39:03 -04:00
Akihiro Suda
135a4d9104 update cri vendor 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-06-05 16:54:32 +09:00
Lantao Liu
8bcb9a9539 Merge pull request #801 from Random-Liu/fix-ctr-timeout 
FIx ctr cri timeout.
 2018-06-05 00:27:02 -07:00
Lantao Liu
0faff1c22f Fix ctr cri timeout. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 01:24:28 +00:00
Lantao Liu
ecf8d99d06 Merge pull request #799 from AkihiroSuda/oci-content-store 
vendor containerd (#2135)
 2018-06-04 10:34:43 -07:00
Akihiro Suda
097249054d vendor containerd (#2135) 
For containerd/containerd#2135

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-06-02 23:10:59 +09:00
Phil Estes
84bebdd91d Merge pull request #2379 from dmcgowan/fix-direct-io-terminal-setting 
Fix creation of DirectIO overwriting fifo config
 2018-06-02 12:25:14 +03:00
Phil Estes
b867977c01 Merge pull request #2380 from dmcgowan/ignore-zero-msg-size-configs 
Ignore zero max message size in grpc config
 2018-06-02 12:22:04 +03:00
Derek McGowan
993d4b8fc5 Ignore zero max message size in grpc config 
Fixes upgrade issue where existing configs cause
the max message size to get set to 0.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-06-01 16:21:53 -07:00
Derek McGowan
6b9be1bfc3 Fix creation of DirectIO overwriting fifo config 
Creating a direct IO should not overwrite the fifo
configuration. The fifo configuration can be updated
before creating the direct io if needed.
This fixes an expected change in behavior for clients
who were calling NewDirectIO previously with terminal
configured on the fifo.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-06-01 16:04:22 -07:00
Michael Crosby
5b1f69be8a Merge pull request #2135 from AkihiroSuda/oci-content-store 
content: change Writer/ReaderAt to take OCI descriptor
 2018-06-01 13:14:35 -04:00
Michael Crosby
e1428ef054 Merge pull request #2378 from thaJeztah/update_microsoft_vendors 
Update go-winio and hcsshim
 2018-06-01 12:30:00 -04:00
Sebastiaan van Stijn
55118c5469 Update go-winio and hcsshim 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-06-01 18:04:25 +02:00
Lantao Liu
0a5c05bcd4 Merge pull request #776 from Random-Liu/disable-streaming 
Disable TLS streaming to work with new kubelet streaming proxy.
 2018-06-01 00:48:44 -07:00
Akihiro Suda
d88de4a34f content: change Writer/ReaderAt to take OCI 
This change allows implementations to resolve the location of the actual data
using OCI descriptor fields such as MediaType.

No OCI descriptor field is written to the store.

No change on gRPC API.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-06-01 11:51:43 +09:00
Lantao Liu
578b34f112 Merge pull request #794 from Random-Liu/panic-for-cri-start-failure 
Generate fatal error when cri plugin fail to start.
 2018-05-31 13:21:16 -07:00
Lantao Liu
b870ee7942 Generate fatal error when cri plugin fail to start. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-31 10:49:11 -07:00
Michael Crosby
e4ad710ce8 Merge pull request #2375 from AkihiroSuda/update-cri-20180531 
update cri vendor
 2018-05-31 10:44:02 -04:00
Akihiro Suda
17a54d02c4 update cri vendor 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-05-31 17:37:16 +09:00
Lantao Liu
b68fb075d4 Merge pull request #793 from Random-Liu/port-containerd-fix-#2364 
Port docker resolver fix #2364.
 2018-05-31 01:03:00 -07:00
Lantao Liu
0fae42b9b8 Port docker resolver fix #2364. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-30 17:25:46 -07:00
Lantao Liu
8bb978e3d6 Merge pull request #785 from ehazlett/containerd-vendor-bump 
containerd vendor update
 2018-05-30 17:23:07 -07:00
Evan Hazlett
d7d2212324 vendor bump 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

containerd: linux -> runtime/linux

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

fix utils to properly format vendor repo

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

test fixup

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-05-30 19:51:24 -04:00
Derek McGowan
1e8b09cfc6 Merge pull request #2353 from ehazlett/process-runtime 
linux -> runtime/linux
 2018-05-30 10:06:36 -07:00
Lantao Liu
40b60834a2 Merge pull request #789 from Random-Liu/configurable-containerd-build 
Make DEPLOY_PATH configurable.
 2018-05-30 09:37:58 -07:00
Michael Crosby
c7083eed5d Merge pull request #2369 from dmcgowan/update-grpc 
Update grpc to 1.12
 2018-05-30 11:07:10 -04:00
Evan Hazlett
6653917ef9 vendor update 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-05-30 09:23:10 -04:00
Evan Hazlett
cae94b930d linux -> runtime/linux 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-05-30 09:23:10 -04:00
Evan Hazlett
8d768689fa cri vendor bump 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-05-30 09:15:24 -04:00
Lantao Liu
1892b30fa7 Make DEPLOY_PATH configurable. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-29 17:23:32 -07:00
Derek McGowan
55afe3359a Update grpc timeout and logger 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-05-29 15:32:37 -07:00
Lantao Liu
52460ebf6e Merge pull request #788 from BSWANG/patch-1 
Update cni.template
 2018-05-29 14:36:28 -07:00
Akihiro Suda
80bbaff07a Merge pull request #2361 from masters-of-cats/no-new-keyring 
Implement WithNoNewKeyring
 2018-05-30 06:23:45 +09:00
Phil Estes
7f800e0a7b Merge pull request #2364 from dmcgowan/fix-http-seeker-unsupported-range 
Fix size validation bug with some registries
 2018-05-29 09:22:37 -04:00
Oliver Stenbom
7132ca2775 Implements WithNoNewKeyring 
It does not override existing CreateOptions but assumes that the
TaskInfo's options are of type CreateOptions.

Signed-off-by: Oliver Stenbom <ostenbom@pivotal.io>
 2018-05-28 12:26:56 +03:00
Bingshen Wang
7bd86a2252 Update cni.template 
Format the cni.template, use `space` instead of some `tab`. Avoid indent issue in text editor.

Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2018-05-28 16:04:44 +08:00
Derek McGowan
59740d8985 Fix invalid length bug with some registries 
Ensures that the client can handle cases where the
registry ignores content length.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-05-26 23:41:56 -07:00
Akihiro Suda
cecf576819 Merge pull request #2362 from crosbymichael/cont-bump 
Update continuity to d3c23511c1bf5851696cba83143d9
 2018-05-26 15:59:56 +09:00
Derek McGowan
d2fc059229 Update grpc to 1.12 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-05-25 13:22:18 -07:00
Michael Crosby
024a4210c7 Update continuity to d3c23511c1bf5851696cba83143d9 
This includes updates for resolving links on windows.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-05-25 14:50:32 -04:00
Phil Estes
e9434a10bc Merge pull request #2341 from dmcgowan/move-client-content-snapshot 
Move client implementations for content store and snapshotter
 2018-05-25 13:47:39 -04:00
Lantao Liu
574f9496ef Merge pull request #786 from fuweid/remove_useless_check 
Remove useless error-check in createImageReference
 2018-05-24 23:51:30 -07:00
Wei Fu
e28b77c08c Remove useless error-check in createImageReference 
Signed-off-by: Wei Fu <fhfuwei@163.com>
 2018-05-25 10:23:13 +08:00
Lantao Liu
24a9642672 Merge pull request #784 from cpuguy83/bump_continuity 
Bump continuity to fix copy files > 2^32 bytes
 2018-05-24 14:01:35 -07:00