Commit Graph

185 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Derek McGowan
1e8b09cfc6
Merge pull request #2353 from ehazlett/process-runtime
linux -> runtime/linux
2018-05-30 10:06:36 -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
8d768689fa cri vendor bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 09:15:24 -04: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
Brian Goff
7e5a91fa51 Bump continuity to fix copy files > 2^32 bytes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-05-23 20:53:14 -04:00
Darren Stahl
07d8716004 Update hcsshim to v0.6.10
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-05-02 16:19:15 -07:00
Ian Campbell
623407a399 Re-vndr with newest vndr
This seems to pickup a bunch of *.c files and some other changes which follow
from having included some new packages because of that.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-05-01 00:18:17 +01:00
Ian Campbell
388c73052a Bump to latest go-digest.
This renames the license file (so automated tooling can find it, which I care
about) and also pulls in some documentation and comment changes, plus some
functional changes:

PR#33 -- future-proof the algorithm field.
PR#34 -- disallow upper case in hex portion.

No changes appear to be required to containerd code.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-04-30 23:38:02 +01:00
Andrei Vagin
0846d6f8e9 vendor: update go-runc
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-27 23:45:54 +03:00
Lantao Liu
9c9abec21c Update cri plugin to v1.0.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-23 16:34:17 -07:00
Lantao Liu
6da553e112 Update cri plugin to v1.0.0-rc.2.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-13 07:01:48 +00:00
Stephen J Day
caac3bca3e
protobuf: remove generated google/rpc files
We move from having our own generated version of the googleapis files to
an upstream version that is present in gogo. As part of this, we update
the protobuf package to 1.0 and make some corrections for slight
differences in the generated code.

The impact of this change is very low.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-04-05 14:36:32 -07:00
Lantao Liu
89d74986cc Update cri plugin to v1.0.0-rc.1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 21:11:38 +00:00
Derek McGowan
ac5432a06b
Merge pull request #2253 from stevvooe/report-zfs-correctly
vendor: update zfs dependency
2018-03-29 18:30:57 -07:00
Stephen J Day
ca4ccf4afc
vendor: update zfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 14:48:12 -07:00
Stephen J Day
bea2304ca4
vendor: update aufs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 13:33:10 -07:00
Lantao Liu
8958b489ba Update to cri v1.0.0-rc.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-26 22:24:25 +00:00
Stephen J Day
ab8e05ac50
cmd/containerd: include aufs by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-23 11:27:12 -07:00
Michael Crosby
3e8e9d3ed7
Merge pull request #2223 from dmcgowan/with-lease-context
lease: pass in context to lease done function in client
2018-03-23 10:27:39 -04:00
Derek McGowan
43d0a5cb60
Pass in context to lease done function in client
Allows the client to choose the context to finish the lease.
This allows the client to switch contexts when the main context
used to the create the lease may have been cancelled.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 14:09:24 -07:00
Derek McGowan
9b111bdc39
Add ignore socket test
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 13:17:33 -07:00
Phil Estes
f5d7bfb56e
Merge pull request #2213 from crosbymichael/runc
Bump runc to 69663f0bd4b60df09991c08812a60108003fa
2018-03-16 12:54:54 +02:00
Michael Crosby
f117459c35 Bump runc to 69663f0bd4b60df09991c08812a60108003fa
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-15 14:14:41 -04:00
Stephen J Day
f4113a903a
containerd: include zfs plugin by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-14 10:29:23 -07:00
Lantao Liu
9460f94c10 Update containerd/cri to 0c87604068
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-14 01:11:29 +00:00
Stephen Day
3013762fc5
Merge pull request #2203 from Random-Liu/support-in-process-integration
Support in process integration
2018-03-12 14:38:27 -07:00
Lantao Liu
ba93435337 Temporary cri-containerd change
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-12 18:03:50 +00:00
Phil Estes
e38b2bbc3f
Update cgroups vendor for license headers/bug fix
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-03-09 15:54:13 -05:00
Michael Crosby
179382028a Update containerd deps
This includes general fixes and the license change where the license is
included in all files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-08 13:57:30 -05:00
Stephen J Day
23751c9ced
vendor: update btrfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-06 13:16:56 -08:00
Stephen J Day
9cdd036393
build: bump to Go 1.10
Bumps the build to use Go 1.10, which allows us to drop the forked tar
package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-26 16:47:24 -08:00
Lantao Liu
ad04781e3e Update cri-containerd to 5bd99af7db
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-24 00:09:26 +00:00
Derek McGowan
5bd99af7db
Merge pull request #2097 from Random-Liu/vendor-cri-plugin
Vendor cri plugin into containerd.
2018-02-23 13:55:13 -08:00
Eli Uriegas
735114f500 Update continuity vendor to d8fb85
Includes a fix for 32bit systems

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-02-17 00:23:42 +00:00
Lantao Liu
fa91b905e9 Update vendors.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-16 23:23:47 +00:00
Derek McGowan
ca3eb742fd
Update continuity vendor
Picks up fix for consecutive directory deletion

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-12 10:45:15 -08:00
Daniel Nephin
1719a6e17a Vendor gotestyourself
and remove testify and spew

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:23 -05:00
Stephen Day
ee6ffdd91e
Merge pull request #2116 from crosbymichael/bump-runc
Update runc to a618ab5a0186905949ee463dbb762c3d23e
2018-02-08 15:09:43 -08:00
Michael Crosby
73837b11db Update runc to a618ab5a0186905949ee463dbb762c3d23e
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-08 11:30:24 -05:00
Brian Goff
c776b6d8d9 Use continuity fs package
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-07 12:40:52 -05:00
Michael Crosby
9745a4d448 Update ttrpc to d4528379866b0ce7e9d71f3eb96f0582fc
Contains the OnClose method for the client

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-06 10:27:36 -05:00
Akihiro Suda
36a2deb029 vendor: update BurntSushi/toml for MIT license
Follow-up to #2088

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-02 15:51:57 +09:00