github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
4,755 Commits 3 Branches 2 Tags 112 MiB
d15a06b190
Commit Graph

4755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Phil Estes
48a1fca855
Merge pull request #3314 from KentaTada/fix-clone-seccomp-cgroupns 
Fix seccomp contributed profile for clone syscall
 2019-06-03 17:51:55 +01:00
Michael Crosby
2ec2089b05
Merge pull request #3123 from stefanberger/extend_apply_call_with_options_parameter 
Extend Applier's Apply() method with an optional options parameter
 2019-06-03 11:13:40 -04:00
Michael Crosby
efe6d8ddad
Merge pull request #3319 from Vanient/master 
Close file r.log after used to release resources.
 2019-06-03 10:43:27 -04:00
Danni Xia
bf24fb0cad Close file r.log after used to release resources. 
Signed-off-by: Danni Xia <xiadanni1@huawei.com>
 2019-06-04 06:41:38 +08:00
Kenta Tada
5b9a43d2e7 Fix seccomp contributed profile for clone syscall 
All clone flags for namespace should be denied.
Also x/sys should be used instead of syscall.

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
 2019-06-03 14:23:34 +09:00
Phil Estes
1c5b384b30
Merge pull request #3313 from kevpar/service-restart-delay 
Change restart delay for Windows service to 15s
 2019-05-31 15:30:59 +01:00
Kevin Parsons
cee19d1e6e Change restart delay for Windows service to 15s 
Previously we waited for 60 seconds after the service faults to restart
it. However, there isn't much benefit to waiting this long. We expect
15 seconds to be a more reasonable delay.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-05-29 16:41:27 -07:00
Wei Fu
8a388d6238 leases: support resource management 
Add three methods for lease service so that the client can use it to
manage the resource by lease, not just gc.root label. With the following
methods, it is easy for client to maintain their own cache system.

```
 - AddResource(context.Context, Lease, Resource) error
 - RemoveResource(context.Context, Lease, Resource) error
 - ListResources(context.Context, Lease) ([]Resource, error)
```

And the resource is to be

```golang
type Resource {
  ID   string
  Type string
}
```

For the snapshots, the Type field will be formatted by
snapshots/%{type}, like snapshots/overlayfs.

fix: #3295

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-05-29 11:00:32 +08:00
Justin Terry (VM)
ac4485c76a Add support to gRPC errdefs for context cancel/deadline exceeded 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-28 17:02:29 -07:00
Derek McGowan
0e7a3c9e51
Merge pull request #3298 from jterry75/sync_tar2ext4_write 
Forcibly sync writes on lcow layer.vhd after write
 2019-05-24 12:06:27 -07:00
Michael Crosby
d57cf6f151
Merge pull request #3297 from BenTheElder/add-restart 
add Restart=always to unit file
 2019-05-23 22:09:34 -04:00
Benjamin Elder
bbe45e4467 add Restart=always to unit file 
Signed-off-by: Benjamin Elder <bentheelder@google.com>
 2019-05-23 15:21:42 -07:00
Phil Estes
01191a21b0
Merge pull request #3299 from Random-Liu/use-mkdirall 
Not return error when rootfs already exists
 2019-05-23 22:03:55 +02:00
Wei Fu
290fc9eeab
Merge pull request #3301 from dmcgowan/add-run-platform 
Fix run with specified platform
 2019-05-24 03:22:35 +08:00
Derek McGowan
a274dbe822
Fix run with specified platform 
Adds the platform flag to the run command and resolves
the image based on that platform.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-05-23 11:59:33 -07:00
Lantao Liu
48b81e872c Do not return error when rootfs already exists. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-22 15:57:19 -07:00
Justin Terry (VM)
e0c4fe4110 Forcibly sync writes on lcow layer.vhd after write 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-22 13:31:58 -07:00
Derek McGowan
25daa7355c
Merge pull request #3192 from thaJeztah/bump_grpc_1.19.1 
bump google.golang.org/grpc v1.20.1
 2019-05-22 11:58:52 -07:00
Derek McGowan
c9c555cd71
Merge pull request #3226 from Ace-Tang/kill_shim_in_clean 
runtime-v1: kill shim in exit handler
 2019-05-22 11:56:40 -07:00
Derek McGowan
ec0b722083
Merge pull request #3292 from crosbymichael/shim-cgroup 
Add shim cgroup support for v2 runtimes
 2019-05-22 10:32:47 -07:00
Michael Crosby
b7f093eaa2
Merge pull request #3296 from dmcgowan/fix-export-labels 
Use a single custom annotation for export
 2019-05-22 09:46:24 -04:00
Derek McGowan
5e2d7efd82
Use a single custom annotation for export 
Remove annotation prefix and add multiple index records
for manifests with multiple image names. This makes the
custom annotation more consistent with the OCI image
annotation. Additionally, ensure the OCI image annotation
always represents the tag (partial image name) as recommended
by the specification. The containerd image name annotation
will always contain the full image name.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-05-21 17:21:26 -07:00
Phil Estes
2088fc999c
Merge pull request #3294 from dmcgowan/fix-metadata-panic 
Ensure namespaced writer commit has correct namespace
 2019-05-22 00:49:40 +02:00
Derek McGowan
30082abed3
Merge pull request #3293 from crosbymichael/atomic-delete 
Improve atomic delete
 2019-05-21 13:54:47 -07:00
Derek McGowan
41b7b0e0dc
Ensure namespaced writer commit has correct namespace 
The namespaced writer Commit method must always have a
namespace in the context as checked by the removeIngestLease
function, resulting in a panic when not provided.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-05-21 11:08:55 -07:00