Akihiro Suda
e1221e69a8
revendor containerd/cgroups
...
Note: now vndr >= v0.10 is required (https://github.com/containerd/cgroups/issues/139 )
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-13 16:09:59 +09:00
Wei Fu
1c2606d05b
Merge pull request #3946 from wawa0210/bump-hcsshim
...
bump microsoft/hcsshim to 0.8.7
2020-01-13 09:30:43 +08:00
wawa0210
4d62d8795c
bump microsoft/hcsshim to 0.8.7
...
Signed-off-by: 张潇 <xiaozhang0210@hotmail.com>
2020-01-11 13:45:30 +08:00
Akihiro Suda
982e767745
Merge pull request #1374 from lumjjb/bump_containerd
...
Bump vendor containerd/containerd version
2020-01-11 07:28:33 +09:00
Brandon Lum
73cd077c6b
Bump vendor containerd/containerd version
...
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2020-01-10 20:13:22 +00:00
Yecheng Fu
ef7f327f2a
update config syntax in registry.md
...
Signed-off-by: Yecheng Fu <fuyecheng@pingcap.com>
2020-01-10 17:43:41 +08:00
Lantao Liu
83a9d2460c
Merge pull request #1363 from Random-Liu/fix-validate-config
...
Validate and update the right config
2020-01-10 00:11:27 -08:00
Phil Estes
0a1f2b4064
Merge pull request #3952 from lumjjb/fix_unpacker
...
Fix unpacker to pass apply options
2020-01-09 11:49:06 -05:00
Brandon Lum
95fbf3dc28
Fix unpacker to pass use apply options
...
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2020-01-09 15:10:07 +00:00
Phil Estes
7804afb226
Merge pull request #3950 from dmcgowan/fix-printf-scanner-error
...
Fix filter errors
2020-01-09 09:21:30 -05:00
Akihiro Suda
71740399e0
cgroup2: unshare cgroup namespace for containers
...
In cgroup v1 container implementations, cgroupns is not used by default because
it was not available in the kernel until kernel 4.6 (May 2016), and the default
behavior will not change on cgroup v1 environments, because changing the
default will break compatibility and surprise users.
For cgroup v2, implementations are going to unshare cgroupns by default
so as to hide /sys/fs/cgroup from containers.
* Discussion: https://github.com/containers/libpod/issues/4363
* Podman PR (merged): https://github.com/containers/libpod/pull/4374
* Moby PR: https://github.com/moby/moby/pull/40174
This PR enables cgroupns for containers, but pod sandboxes are untouched
because probably there is no need to do.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-09 14:58:30 +09:00
Maksym Pavlenko
9f193c41d7
Merge pull request #3948 from jterry75/fix_lcow_size
...
Support disk usage in windows-lcow snapshot
2020-01-08 20:47:48 -08:00
Derek McGowan
3af3a76026
Fix filter errors
...
Prevent error messages from being output to stderr.
Return illegal token when a quoted string is invalid and
capture the error.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-01-08 18:07:50 -08:00
Hu Shuai
7b52bc506c
Add unit test for func in filter.go
...
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2020-01-09 09:11:37 +08:00
Justin
522a056fe6
Merge pull request #1368 from mikebrow/vendor-update-2020-01-06
...
update for containerd vendor changes
2020-01-08 14:57:45 -08:00
Justin Terry (VM)
cd1cad9d55
Support disk usage in windows-lcow snapshot
...
Windows snapshot usage was completed in ref: #3785 but lcow didnt get updated.
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2020-01-08 13:43:48 -08:00
Mike Brown
2da1ced9a1
update for containerd vendor changes
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-01-08 15:30:36 -06:00
Michael Crosby
d3c1691ae1
Merge pull request #3933 from AkihiroSuda/update-rootless-md
...
update docs/rootless.md
2020-01-08 11:10:28 -05:00
Michael Crosby
8b3ef5fb20
Merge pull request #3944 from zhsj/fix-openlabci
...
ci: set pipefail in zuul script
2020-01-08 11:03:12 -05:00
Michael Crosby
41088e405f
Merge pull request #3939 from zhsj/fix-arm
...
platforms: fill default arm variant when parse platform specifier
2020-01-08 11:00:56 -05:00
Phil Estes
80d50a8a63
Merge pull request #3925 from dmcgowan/snapshot-cleanup-api
...
Add Cleanup to snapshot API
2020-01-08 10:03:18 -05:00
Phil Estes
3e9ef5db79
Merge pull request #3941 from dmcgowan/skip_tests
...
Add Makefile variable to skip test packages
2020-01-08 09:44:05 -05:00
Shengjing Zhu
f3090ce80f
ci: set pipefail in zuul script
...
Otherwise the exit code is always 0
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-01-08 13:50:20 +08:00
Shengjing Zhu
90cd777a6c
platforms: fill default arm variant when parse platform specifier
...
arm has been supported, but something is missing, causes test failure
--- FAIL: TestParseSelector/linux (0.00s)
platforms_test.go:292: arm support not fully implemented: not implemented
--- FAIL: TestParseSelector/macOS (0.00s)
platforms_test.go:292: arm support not fully implemented: not implemented
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-01-08 13:35:49 +08:00
Akihiro Suda
b553bc14a2
update docs/rootless.md
...
* Updated an example config to v2 syntax
* Updated for shim v2 (relates to #2767 )
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-08 13:37:29 +09:00
Derek McGowan
94d499843c
Add Makefile variable to skip test packages
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-01-07 15:25:05 -08:00
Derek McGowan
123af61c0b
Add Cleanup to snapshot API
...
Cleanup is an optional method a snapshotter may implement.
Cleanup can be used to cleanup resources after a snapshot
has been removed. This function allows a snapshotter to defer
longer resource cleanup until after snapshot removals are
completed. Adding this to the API allows proxy snapshotters
to leverage this enhancement.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-01-07 14:59:20 -08:00
Michael Crosby
0d276ece0e
Merge pull request #3932 from AkihiroSuda/ovl-test-opts
...
overlay: test actual Opts
2020-01-07 12:07:07 -05:00
Michael Crosby
fda9cebc81
Merge pull request #3936 from hs0210/work
...
Fix outdated comments
2020-01-07 11:45:56 -05:00
Phil Estes
da2890a908
Merge pull request #3934 from AkihiroSuda/ctr-address-env
...
ctr: support $CONTAINERD_ADDRESS env var
2020-01-07 09:14:48 -05:00
Phil Estes
82fdac1cd6
Merge pull request #3935 from zhsj/fix-gccgo
...
Fix build with gccgo
2020-01-07 08:47:14 -05:00
Shengjing Zhu
465c11dc87
Fix build with gccgo
...
+ archive: don't convert syscall.Timespec to unix.Timespec
archive/tar_unix.go:179:76: error: invalid type conversion (cannot use type syscall.Timespec as type unix.Timespec)
179 | timespec := []unix.Timespec{unix.Timespec(fs.StatAtime(st)), unix.Timespec(fs.StatMtime(st))}
+ gccgo has no plugin support
https://github.com/golang/go/issues/36403
+ update github.com/containerd/continuity
to include same fix for Timespec
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-01-07 19:28:26 +08:00
Hu Shuai
52e477f947
Fix outdated comments
...
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2020-01-07 16:30:44 +08:00
Akihiro Suda
b127b666aa
ctr: support $CONTAINERD_ADDRESS env var
...
`$CONTAINERD_ADDRESS` can be specified instead of the `ctr --address` flag.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-07 15:59:12 +09:00
Akihiro Suda
a4b423b19b
overlay: test actual Opts
...
AsynchronousRemove opt was untested while it is specified by default in the plugin init.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-07 13:52:13 +09:00
Wei Fu
d5714702d1
Merge pull request #3883 from AkihiroSuda/ci-crun
...
.travis.yml: run test with crun
2020-01-07 12:46:32 +08:00
Akihiro Suda
067a66b90a
.travis.yml: run test with crun
...
Relates to #3727
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-06 16:29:06 -08:00
Mike Brown
55566f9682
Merge pull request #1364 from katiewasnothere/local_introspection
...
add introspection service to cri plugin
2020-01-06 15:58:17 -08:00
Derek McGowan
b9fad5e310
Merge pull request #3765 from AkihiroSuda/mount-fuse
...
mount: support FUSE helper
2020-01-06 11:15:39 -08:00
Wei Fu
7c856d1980
Merge pull request #3929 from darfux/v2_fix_win_ctx_ns
...
v2: Fix missing ns when openShimLog on windows
2020-01-06 15:42:32 +08:00
Li Yuxuan
1fb1d93212
v2: Fix missing ns when openShimLog on windows
...
Related to
https://github.com/containerd/containerd/pull/3921#discussion_r363046745
Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2020-01-05 19:42:33 +08:00
Kathryn Baldauf
63d2a0445c
add local support for introspection service
...
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-01-03 11:42:21 -08:00
Wei Fu
5fc0f30167
Merge pull request #3903 from katiewasnothere/local_introspection
...
create local version of introspection service
2020-01-03 15:36:31 +08:00
Kathryn Baldauf
a18f77bea0
create local version of introspection service
...
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-01-02 12:34:23 -08:00
Phil Estes
b95fa01b95
Merge pull request #3915 from yeahdongcn/push
...
Support pushing a specific platform of a multi-architecture docker image to a registry
2020-01-02 12:26:35 -05:00
Akihiro Suda
e739314ed4
mount: support FUSE helper
...
When m.Type starts with either `fuse.` or `fuse3`, the
mount helper binary `mount.fuse` or `mount.fuse3` is executed.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-01 04:16:30 +09:00
Phil Estes
537afb1498
Merge pull request #3921 from darfux/v2_try_to_delete_shim_when_create_fail
...
v2: Call shim.Delete at first when create is failed
2019-12-31 00:02:27 -05:00
Michael Crosby
06b15f072d
Merge pull request #3920 from hs0210/work
...
Fix a typo in task.go
2019-12-30 10:49:04 -05:00
hs0210
87e2a95951
Fix a typo in task.go
...
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2019-12-30 13:40:33 +08:00
Derek McGowan
f823c37708
Merge pull request #3904 from yeahdongcn/manifest
...
Replace ocispec.MediaTypeImageManifest with manifest.MediaType
2019-12-27 22:03:13 -08:00