diff options
| author | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2019-11-05 16:10:19 +0900 |
|---|---|---|
| committer | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2020-01-01 02:58:40 +0900 |
| commit | 612343618dd7dad7cf023e6263d693ab37507a92 (patch) | |
| tree | 58b4b4f747e28f35e3001f611acbed4108b90493 /plugin/executor | |
| parent | e6f6c35b79028e3f59ee99a5482641ac6d2e7f23 (diff) | |
| download | docker-612343618dd7dad7cf023e6263d693ab37507a92.tar.gz | |
cgroup2: use shim V2
* Requires containerd binaries from containerd/containerd#3799 . Metrics are unimplemented yet.
* Works with crun v0.10.4, but `--security-opt seccomp=unconfined` is needed unless using master version of libseccomp
( containers/crun#156, seccomp/libseccomp#177 )
* Doesn't work with master runc yet
* Resource limitations are unimplemented
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Diffstat (limited to 'plugin/executor')
| -rw-r--r-- | plugin/executor/containerd/containerd.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/executor/containerd/containerd.go b/plugin/executor/containerd/containerd.go index 91bae6c6b9..aeeb2184ec 100644 --- a/plugin/executor/containerd/containerd.go +++ b/plugin/executor/containerd/containerd.go @@ -26,13 +26,13 @@ type ExitHandler interface { } // New creates a new containerd plugin executor -func New(ctx context.Context, rootDir string, cli *containerd.Client, ns string, exitHandler ExitHandler) (*Executor, error) { +func New(ctx context.Context, rootDir string, cli *containerd.Client, ns string, exitHandler ExitHandler, useShimV2 bool) (*Executor, error) { e := &Executor{ rootDir: rootDir, exitHandler: exitHandler, } - client, err := libcontainerd.NewClient(ctx, cli, rootDir, ns, e) + client, err := libcontainerd.NewClient(ctx, cli, rootDir, ns, e, useShimV2) if err != nil { return nil, errors.Wrap(err, "error creating containerd exec client") } |
