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

3757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Phil Estes
b307df2723
Merge pull request #2207 from jessvalarezo/ctr-task-d-update 
ctr: allow for force kill when deleting task process
 2018-03-14 03:41:23 -04:00
Derek McGowan
1a930e502b
Merge pull request #2175 from Random-Liu/plugin-cri-cli 
Plug-in cri subcommand
 2018-03-13 20:16:38 -07:00
Derek McGowan
8fc382cba3
Merge pull request #2208 from jessvalarezo/windows-runtime-platform 
windows: define platform in runtime plugin init
 2018-03-13 19:58:25 -07:00
Lantao Liu
ea6a10c412 Add cri subcommand and add ctr/command package 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-14 01:11:29 +00: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
Jess Valarezo
54a46068a1 windows: define platform in runtime plugin init 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-13 17:11:16 -07:00
Jess Valarezo
e343006b8f ctr: allow for force kill when deleting task process 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-13 14:58:31 -07:00
Kenfe-Mickaël Laventure
6b0109942f
Merge pull request #2206 from stevvooe/images-alias 
cmd/ctr/images: add `i` alias for images command
 2018-03-13 06:27:36 -07:00
Stephen Day
220a479292
Merge pull request #1833 from dmcgowan/snapshot-gc-3rd-phase 
snapshots/overlay: add overlay cleanup
 2018-03-12 17:49:56 -07:00
Stephen J Day
ae11d8c64b
cmd/ctr/images: add i alias for images command 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-03-12 17:42:41 -07:00
Jess Valarezo
c3cf3d7822 allow content to be pulled for specific platform(s), all platforms 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2018-03-12 17:31:42 -07:00
Stephen Day
b3b95c0a2a
Merge pull request #2154 from dmcgowan/shared-content-ingests 
content: shared content across namespaces
 2018-03-12 16:11:32 -07: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
Derek McGowan
23ccbdd64f
Merge pull request #2159 from AkihiroSuda/check-overlay 
overlay: add Supported() checker
 2018-03-12 12:52:31 -07:00
Lantao Liu
1128b3d664 Add service plugin and support in process integration. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-12 18:03:50 +00:00
Lantao Liu
ba93435337 Temporary cri-containerd change 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-12 18:03:50 +00:00
Derek McGowan
edf7f410fb
Merge pull request #2199 from estesp/vndr-cgroups-fix-licenses 
Update cgroups vendor for license headers/bug fix
 2018-03-09 13:10:35 -08: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
Akihiro Suda
44524909d1
Merge pull request #2197 from crosbymichael/deps 
Update containerd deps
 2018-03-09 12:23:06 +09: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
Phil Estes
544717986d
Merge pull request #2192 from kunalkushwaha/update-readme-ltag 
Adds note about applying license header
 2018-03-08 11:03:01 -05:00
Kunal Kushwaha
224ecf0d71 Adds note about applying license header 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2018-03-08 10:47:38 +09:00
Michael Crosby
856ea51c8b
Merge pull request #2182 from AkihiroSuda/shimtest 
linux: fix runtime-root propagation
 2018-03-07 11:36:14 -05:00
Michael Crosby
77a5804f6a
Merge pull request #2178 from kunalkushwaha/file-header-ci-check 
CI check for file-header added
 2018-03-07 10:29:26 -05:00
Stephen Day
5368984859
Merge pull request #2160 from ijc/ctr-run-unpack 
ctr: unpack the image on run if necessary
 2018-03-06 19:29:43 -08:00