Commit Graph

4144 Commits

Author SHA1 Message Date
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
Michael Crosby
db1630d0bb
Merge pull request #2190 from stevvooe/vendor-update-btrfs
vendor: update btrfs dependency
2018-03-06 16:32:48 -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
Phil Estes
d086e56255
Merge pull request #2187 from crosbymichael/sigpipe
Handle SIGPIPE in shims
2018-03-06 13:31:39 -05:00
Michael Crosby
1eabab31aa Handle SIGPIPE in shims
ref: https://github.com/moby/moby/issues/36464

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-06 12:54:16 -05:00
Akihiro Suda
5cc915c26c overlay: add Supported() checker
This function is not called during plugin initialization (#2140),
but should be useful for downstream projects that uses overlayfs
snapshotter as a Go library.

Benchmark result on Ubuntu 17.10, GCE n1-standard-4:

BenchmarkOverlaySupportedOnExt4-4                    100          20490598 ns/op
BenchmarkOverlayUnsupportedOnFType0XFS-4           30000             39316 ns/op
BenchmarkOverlaySupportedOnFType1XFS-4               100          19287083 ns/op
BenchmarkOverlayUnsupportedOnFAT-4                   100          14217772 ns/op

i.e. the overhead is typically about 20 msec on this machine.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-06 16:53:21 +09:00
Kunal Kushwaha
f040e6ab59 CI check for file-header added
file-header check using github.com/kunalkushwaha/ltag

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-06 15:57:08 +09:00
Derek McGowan
2b6b99b4a1
Merge pull request #2184 from kunalkushwaha/oci-error
better image config parse error.
2018-03-05 10:29:02 -08:00
Kenfe-Mickaël Laventure
a1b511fb80
Merge pull request #2177 from crosbymichael/file-io
Refactor shim to support file logging
2018-03-05 07:52:45 -08:00
Phil Estes
142ecddd0d
Merge pull request #2180 from AkihiroSuda/fix-ctr-c-create-unix
ctr: add UNIX-specific flags to `ctr c create`
2018-03-05 08:53:45 -05:00
Akihiro Suda
05513284e7 ctr: add UNIX-specific flags to ctr c create
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-05 15:26:03 +09:00
Akihiro Suda
125fdeff8a linux: fix runtime-root propagation
faf2781dd2 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-05 15:01:22 +09:00
Kunal Kushwaha
6ed4e9e106 better image config parse error.
compatible oci runtime version printed with parse error

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-05 14:04:08 +09:00
Kunal Kushwaha
3491b9ea4a Copyright header added
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-05 10:07:58 +09:00