From 4e03b0bf7d95a88920dcf5de684e03a213c0c4da Mon Sep 17 00:00:00 2001 From: Sven Pfennig Date: Tue, 12 Sep 2023 18:20:05 +0200 Subject: [PATCH] fix: add cgroup v1 support (#149) --- containerd-shim-lunatic-v1/Cargo.toml | 2 +- containerd-shim-slight-v1/Cargo.toml | 2 +- containerd-shim-spin-v1/Cargo.toml | 2 +- containerd-shim-wws-v1/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containerd-shim-lunatic-v1/Cargo.toml b/containerd-shim-lunatic-v1/Cargo.toml index 2cd015b9..159c5daf 100644 --- a/containerd-shim-lunatic-v1/Cargo.toml +++ b/containerd-shim-lunatic-v1/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] containerd-shim = "0.5.0" containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "7e978edeaf34b54efb895738357c805cf888b76d", features = ["cgroupsv2"] } -libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v2"], default-features = false } +libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v1","v2"], default-features = false } nix = "0.26.2" serde = "1.0.183" serde_json = "1.0.104" diff --git a/containerd-shim-slight-v1/Cargo.toml b/containerd-shim-slight-v1/Cargo.toml index ed8f7b37..11a049ff 100644 --- a/containerd-shim-slight-v1/Cargo.toml +++ b/containerd-shim-slight-v1/Cargo.toml @@ -15,7 +15,7 @@ chrono = "0.4" clap = { version = "4.1", features = ["derive", "env"] } containerd-shim = "0.5.0" containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "7e978edeaf34b54efb895738357c805cf888b76d", features = ["cgroupsv2"] } -libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v2"], default-features = false } +libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v1","v2"], default-features = false } log = "0.4" tokio = { version = "1", features = [ "full" ] } tokio-util = { version = "0.7", features = [ "codec" ]} diff --git a/containerd-shim-spin-v1/Cargo.toml b/containerd-shim-spin-v1/Cargo.toml index 8bbf98c3..c13d9880 100644 --- a/containerd-shim-spin-v1/Cargo.toml +++ b/containerd-shim-spin-v1/Cargo.toml @@ -15,7 +15,7 @@ chrono = "0.4" clap = { version = "4.3", features = ["derive", "env"] } containerd-shim = "0.5.0" containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "7e978edeaf34b54efb895738357c805cf888b76d", features = ["cgroupsv2"] } -libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v2"], default-features = false } +libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v1","v2"], default-features = false } log = "0.4" spin-trigger = { git = "https://github.com/fermyon/spin", tag = "v1.4.1" } spin-app = { git = "https://github.com/fermyon/spin", tag = "v1.4.1" } diff --git a/containerd-shim-wws-v1/Cargo.toml b/containerd-shim-wws-v1/Cargo.toml index 49fe5af7..bd3eda7f 100644 --- a/containerd-shim-wws-v1/Cargo.toml +++ b/containerd-shim-wws-v1/Cargo.toml @@ -15,7 +15,7 @@ Containerd shim for running Wasm Workers Server workloads. [dependencies] containerd-shim = "0.5.0" containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "7e978edeaf34b54efb895738357c805cf888b76d", features = ["cgroupsv2"] } -libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v2"], default-features = false } +libcontainer = { git = "https://github.com/containers/youki", rev = "09e67372a892f22a89eeef62ff429c3cbcac6d41", features = ["v1","v2"], default-features = false } wasm-workers-server = { git = "https://github.com/vmware-labs/wasm-workers-server", tag = "v1.5.0" } log = "0.4" tokio = { version = "1", features = [ "full" ] }