github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
4,032 Commits 3 Branches 4 Tags
cb0eed833d8639fadec83105da3485a709d3480c
Commit Graph

4032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
606be14859 Merge pull request #2238 from tklauser/runc-libapparmor-dep 
Drop libapparmor dependency from runc build docs
 2018-03-30 10:18:34 -04: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
Akihiro Suda
7722db0bc5 Merge pull request #2251 from stevvooe/report-aufs-correctly 
vendor: update aufs dependency
 2018-03-30 09:55:20 +09: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
Michael Crosby
cbfc9223a9 Merge pull request #2241 from justincormack/ambient_seccomp 
The set of bounding capabilities is the largest group
 2018-03-29 13:44:30 -04:00
Phil Estes
def3069a67 Merge pull request #2245 from darrenstahlmsft/CloseFail 
Make hcsshim layerwriter close a fatal error
 2018-03-29 11:55:57 -04:00
Tobias Klauser
a74903a307 Drop libapparmor dependency from runc build docs 
As of opencontainers/runc@db093f621f runc
no longer depends on libapparmor thus libapparmor-dev no longer needs to
be installed to build it. Adjust the documentation accordingly.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2018-03-29 09:18:45 +02:00
Darren Stahl
84f6fce240 Make hcsshim layerwriter close a fatal error 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2018-03-28 18:02:45 -07:00
Justin Cormack
9435aeeb30 The set of bounding capabilities is the largest group 
No capabilities can be granted outside the bounding set, so there
is no point looking at any other set for the largest scope.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2018-03-28 17:36:46 -07:00
Stephen Day
79963209f6 Merge pull request #2239 from estesp/fix-test-typeurl 
Fix typo in metadata test typeurl string
 2018-03-28 12:05:29 -07:00
Phil Estes
dd1085c922 Fix typo in metadata test typeurl string 
Incorrectly spelled "containerd" in test string.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-03-28 12:35:42 -04:00
Phil Estes
fec0a1ba89 Merge pull request #2237 from dmcgowan/fix-pull-uncompressed-label 
client/pull: fix label being put on snapshot instead of content
 2018-03-28 12:32:28 -04:00
Phil Estes
bfa7e59cba Merge pull request #2236 from dmcgowan/update-releases-md 
Add CRI API to releases file
 2018-03-28 09:27:42 -04:00
Derek McGowan
d608e3d9dc Fix label being put on snapshot instead of content 
The uncompressed label should be placed on content instead
of snapshots. Currently the uncompressed label is getting
passed into as a label option for apply, which is used to commit
snapshots. The content is already committed, but after apply
the uncompressed diff digest is verified and can be reliably used
to update the content with the label.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-03-27 17:55:35 -07:00
Derek McGowan
e0424e2c76 Add CRI API to releases file 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-03-27 16:33:47 -07:00
Derek McGowan
7833fb49fd Merge pull request #2225 from dmcgowan/prepare-1.1.0-rc0 
Prepare 1.1.0-rc.0 release
 2018-03-27 09:19:04 -07:00
Derek McGowan
92198a60c5 Prepare 1.1.0-rc.0 release 
Add the release notes and update release docs.
Increments version number.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-03-27 00:10:41 -07:00
Derek McGowan
ea37521fda Merge pull request #2233 from Random-Liu/update-cri 
Update cri to v1.0.0-rc.0
 2018-03-27 00:06:34 -07:00
Lantao Liu
74e45c0392 Update cri validation test version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-27 05:15:14 +00: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 Day
2aa2aecbb3 Merge pull request #2229 from stevvooe/timeout-fifo-creation 
linux/prox: timeout fifo creation
 2018-03-26 12:37:41 -07:00
Derek McGowan
ad6d02b881 Merge pull request #2221 from AkihiroSuda/content-small-blob 
services/content: fix reading a blob which is smaller than the read buffer
 2018-03-26 10:43:23 -07:00
Stephen J Day
a76f230984 content/testsuite: include small blob test in standard suite 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-26 08:39:39 -07:00
Michael Crosby
a0c1abba47 Merge pull request #2228 from stevvooe/allow-configuration-msg-size 
server: allow configuration default send/recv message sizes
 2018-03-26 11:26:44 -04:00
Stephen J Day
acc71293c5 server: allow configuration default send/recv message sizes 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-23 16:17:23 -07:00
Stephen J Day
9754696ff5 linux/prox: timeout fifo creation 
Under certain conditions in the client, the fifo for a container may not
be created. A timeout has been added to this operation to ensure the
shim can recover when the client fails to open the fifos.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-23 14:53:13 -07:00
Derek McGowan
8a7e17ef96 Merge pull request #2227 from stevvooe/include-aufs-default 
cmd/containerd: include aufs by default
 2018-03-23 12:33:04 -07: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
Akihiro Suda
7b323b1402 services/content: fix reading a blob which is smaller than the read buffer. 
The newly added test fails without this fix in services/content/service.go:

    $ go test -c . && sudo ./containerd.test -test.v -test.root -test.run TestContentClient
    ...
        --- FAIL: TestContentClient/SmallBlob (0.02s)
            provideringester.go:62: rpc error: code = OutOfRange desc = read
    past object length 6 bytes
            helpers.go:67: drwx------       4096
    /tmp/content-suite-ContentClient-286788688
    FAIL

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-03-23 12:51:28 +09:00
Derek McGowan
382b313c51 Merge pull request #2222 from ijc/ignore-sockets-in-archiver 
Ignore sockets when creating a tar stream of a layer
 2018-03-22 14:11:42 -07: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
Kenfe-Mickaël Laventure
07dfb0368a Merge pull request #2220 from stevvooe/redundant-pkg-name 
cmd/ctr/app: remove redundant package name
 2018-03-22 13:23:50 -07:00
Derek McGowan
804249cdcf Merge pull request #2214 from miaoyq/fixes-config-bug 
Fixes a default config bug of gc scheduler
 2018-03-22 13:21:33 -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
Stephen J Day
903ee88368 cmd/ctr/app: remove redundant package name 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-22 10:12:00 -07:00
Ian Campbell
2ec3382d2d Ignore sockets when creating a tar stream of a layer 
The go-tar implementation which is used cannot handle sockets.

There's no good reason to preserve a socket, they are basically useless without
the process which made them.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2018-03-22 15:19:35 +00:00
Akihiro Suda
9304193b8c Merge pull request #2219 from dmcgowan/fix-lock-on-schema1-configs 
content: add writer open helper to handle unavailable refs
 2018-03-22 11:45:17 +09:00
Derek McGowan
5304ef294b Add writer open helper to handle unavailable refs 
Updates blob writer helper to use new open and ensure
unavailable errors are always handled.
Removes duplication of unavailable handling code.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-03-21 16:30:22 -07:00
Yanqiang Miao
d465f858a0 Fixes a default config bug of gc scheduler 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2018-03-20 19:29:40 +08:00
Kenfe-Mickaël Laventure
4c8bbb55b7 Merge pull request #2216 from crosbymichael/task-id 
Add task.ID() API
 2018-03-19 14:01:54 -07:00
Michael Crosby
9b9a0ac8ad Add task.ID() API 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-03-19 13:44:49 -04:00
Phil Estes
f5d7bfb56e Merge pull request #2213 from crosbymichael/runc 
Bump runc to 69663f0bd4b60df09991c08812a60108003fa
 2018-03-16 12:54:54 +02:00
Lantao Liu
3c1ef1a714 Merge pull request #2212 from dmcgowan/fix-overlay-cleanup-race 
overlay: fix cleanup directory deletion race
 2018-03-15 15:13:30 -07:00
Michael Crosby
f117459c35 Bump runc to 69663f0bd4b60df09991c08812a60108003fa 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-03-15 14:14:41 -04:00
Michael Crosby
ee84187a6a Merge pull request #2096 from stevvooe/include-zfs-by-default 
containerd: include zfs plugin by default
 2018-03-15 13:56:00 -04:00
Derek McGowan
a0b818e093 Merge pull request #2200 from jessvalarezo/multiarch-pulls 
allow content to be pulled for specific platform(s), all platforms
 2018-03-14 14:46:30 -07:00
Derek McGowan
94cf25f7db overlay: fix cleanup directory deletion race 
Fixes a bug where a writable transaction may create or make changes to
a directory while the cleanup is running, leading to removal of a
directory which will be referenced.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-03-14 13:36:49 -07: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