diff --git a/Cargo.toml b/Cargo.toml index 1bb4f574..98bb0dc0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.9.1" +version = "0.9.2" edition = "2021" license = "Apache-2.0" readme = "README.md" diff --git a/containerd-shim-lunatic-v1/Cargo.lock b/containerd-shim-lunatic-v1/Cargo.lock index 0e1ad52e..e8bc223c 100644 --- a/containerd-shim-lunatic-v1/Cargo.lock +++ b/containerd-shim-lunatic-v1/Cargo.lock @@ -458,14 +458,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.2.11" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2" +checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" dependencies = [ "libc", "log", - "nix 0.24.3", + "nix 0.25.1", "regex", + "thiserror", ] [[package]] @@ -555,9 +556,9 @@ dependencies = [ [[package]] name = "containerd-shim" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a08af6d8436b911bd47f34dd3478fe28cfbe40e8e3b2c1d61f3abb264e053d" +checksum = "063d0e137d508846210c2f8b6c6dc3db9f1abd4c20b0a9aecdb962385dcb7899" dependencies = [ "cgroups-rs", "command-fds", @@ -567,14 +568,12 @@ dependencies = [ "libc", "log", "mio", - "nix 0.26.4", + "nix 0.27.1", "oci-spec", "os_pipe", "page_size", "prctl", - "regex", "serde", - "serde_derive", "serde_json", "signal-hook", "thiserror", @@ -584,7 +583,7 @@ dependencies = [ [[package]] name = "containerd-shim-lunatic-v1" -version = "0.1.0" +version = "0.9.2" dependencies = [ "anyhow", "chrono", @@ -601,9 +600,9 @@ dependencies = [ [[package]] name = "containerd-shim-protos" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105ad6d5b553163181f33abdb172e1b1f5f567570632258be016acb09ab9578c" +checksum = "967dbd2804aceb398bd7d867410342d68b9d74c1fead823ad8353b3ab5f23eb7" dependencies = [ "protobuf 3.2.0", "ttrpc", @@ -612,8 +611,8 @@ dependencies = [ [[package]] name = "containerd-shim-wasm" -version = "0.3.0" -source = "git+https://github.com/containerd/runwasi?rev=5a0a47a9ad79f7ae19153897486b8621c8d6a58e#5a0a47a9ad79f7ae19153897486b8621c8d6a58e" +version = "0.4.0" +source = "git+https://github.com/containerd/runwasi?tag=containerd-shim-wasm/v0.4.0#5788ced8525a0d2831718f4a24d06fb4d5af6afb" dependencies = [ "anyhow", "caps", @@ -1226,9 +1225,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1241,9 +1240,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1251,15 +1250,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1269,15 +1268,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -1286,21 +1285,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1874,6 +1873,9 @@ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] [[package]] name = "lunatic-common-api" @@ -2340,10 +2342,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -4126,6 +4129,12 @@ dependencies = [ "serde", ] +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/containerd-shim-lunatic-v1/Cargo.toml b/containerd-shim-lunatic-v1/Cargo.toml index 60a25523..b929894e 100644 --- a/containerd-shim-lunatic-v1/Cargo.toml +++ b/containerd-shim-lunatic-v1/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "containerd-shim-lunatic-v1" -version = "0.1.0" +version = "0.9.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "5a0a47a9ad79f7ae19153897486b8621c8d6a58e" } +containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" } log = "~0.4" anyhow = "1.0.72" chrono = { version = "0.4.26", features = ["std"] } diff --git a/containerd-shim-lunatic-v1/build.rs b/containerd-shim-lunatic-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-lunatic-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/containerd-shim-slight-v1/Cargo.lock b/containerd-shim-slight-v1/Cargo.lock index dc05b2c6..cd291d73 100644 --- a/containerd-shim-slight-v1/Cargo.lock +++ b/containerd-shim-slight-v1/Cargo.lock @@ -1274,14 +1274,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.2.11" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2" +checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" dependencies = [ "libc", "log", - "nix 0.24.3", + "nix 0.25.1", "regex", + "thiserror", ] [[package]] @@ -1420,9 +1421,9 @@ dependencies = [ [[package]] name = "containerd-shim" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a08af6d8436b911bd47f34dd3478fe28cfbe40e8e3b2c1d61f3abb264e053d" +checksum = "063d0e137d508846210c2f8b6c6dc3db9f1abd4c20b0a9aecdb962385dcb7899" dependencies = [ "cgroups-rs", "command-fds", @@ -1432,14 +1433,12 @@ dependencies = [ "libc", "log", "mio", - "nix 0.26.4", + "nix 0.27.1", "oci-spec", "os_pipe", "page_size", "prctl", - "regex", "serde", - "serde_derive", "serde_json", "signal-hook", "thiserror", @@ -1449,9 +1448,9 @@ dependencies = [ [[package]] name = "containerd-shim-protos" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105ad6d5b553163181f33abdb172e1b1f5f567570632258be016acb09ab9578c" +checksum = "967dbd2804aceb398bd7d867410342d68b9d74c1fead823ad8353b3ab5f23eb7" dependencies = [ "protobuf 3.2.0", "ttrpc", @@ -1460,7 +1459,7 @@ dependencies = [ [[package]] name = "containerd-shim-slight-v1" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "containerd-shim-wasm", @@ -1475,8 +1474,8 @@ dependencies = [ [[package]] name = "containerd-shim-wasm" -version = "0.3.0" -source = "git+https://github.com/containerd/runwasi?rev=5a0a47a9ad79f7ae19153897486b8621c8d6a58e#5a0a47a9ad79f7ae19153897486b8621c8d6a58e" +version = "0.4.0" +source = "git+https://github.com/containerd/runwasi?tag=containerd-shim-wasm/v0.4.0#5788ced8525a0d2831718f4a24d06fb4d5af6afb" dependencies = [ "anyhow", "caps", @@ -2287,9 +2286,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2302,9 +2301,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2312,15 +2311,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2330,9 +2329,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2351,9 +2350,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -2362,21 +2361,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -3408,10 +3407,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -3825,9 +3825,9 @@ dependencies = [ [[package]] name = "postgres" -version = "0.19.7" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" +checksum = "2843af30d9b6dccec9f8779eb50d56cfbec54b38c7b1bbaf50b37d6c8a4f8959" dependencies = [ "bytes 1.5.0", "fallible-iterator", diff --git a/containerd-shim-slight-v1/Cargo.toml b/containerd-shim-slight-v1/Cargo.toml index ece3889e..8a261592 100644 --- a/containerd-shim-slight-v1/Cargo.toml +++ b/containerd-shim-slight-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-slight-v1" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' @@ -11,20 +11,17 @@ Containerd shim for running Slight workloads. """ [dependencies] -containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "5a0a47a9ad79f7ae19153897486b8621c8d6a58e" } +containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" } log = "0.4" tokio = { version = "1", features = [ "full" ] } slight = { git = "https://github.com/deislabs/spiderlightning", version = "0.5.1" } openssl = { version = "0.10", features = ["vendored"] } anyhow = "1.0" - +isahc = "1.7" [dependencies.openssl-sys] features = ["vendored"] -[dependencies.isahc] -version = "1.7" - [dependencies.curl] features = ["zlib-ng-compat"] diff --git a/containerd-shim-slight-v1/build.rs b/containerd-shim-slight-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-slight-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/containerd-shim-spin-v1/Cargo.lock b/containerd-shim-spin-v1/Cargo.lock index 52da63aa..d2bb8c4c 100644 --- a/containerd-shim-spin-v1/Cargo.lock +++ b/containerd-shim-spin-v1/Cargo.lock @@ -827,14 +827,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.2.11" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2" +checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" dependencies = [ "libc", "log", - "nix 0.24.3", + "nix 0.25.1", "regex", + "thiserror", ] [[package]] @@ -1044,9 +1045,9 @@ dependencies = [ [[package]] name = "containerd-shim" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a08af6d8436b911bd47f34dd3478fe28cfbe40e8e3b2c1d61f3abb264e053d" +checksum = "063d0e137d508846210c2f8b6c6dc3db9f1abd4c20b0a9aecdb962385dcb7899" dependencies = [ "cgroups-rs", "command-fds", @@ -1056,14 +1057,12 @@ dependencies = [ "libc", "log", "mio", - "nix 0.26.4", + "nix 0.27.1", "oci-spec", "os_pipe", "page_size", "prctl", - "regex", "serde", - "serde_derive", "serde_json", "signal-hook", "thiserror", @@ -1073,9 +1072,9 @@ dependencies = [ [[package]] name = "containerd-shim-protos" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105ad6d5b553163181f33abdb172e1b1f5f567570632258be016acb09ab9578c" +checksum = "967dbd2804aceb398bd7d867410342d68b9d74c1fead823ad8353b3ab5f23eb7" dependencies = [ "protobuf 3.2.0", "ttrpc", @@ -1084,7 +1083,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-v1" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "containerd-shim-wasm", @@ -1106,8 +1105,8 @@ dependencies = [ [[package]] name = "containerd-shim-wasm" -version = "0.3.0" -source = "git+https://github.com/containerd/runwasi?rev=5a0a47a9ad79f7ae19153897486b8621c8d6a58e#5a0a47a9ad79f7ae19153897486b8621c8d6a58e" +version = "0.4.0" +source = "git+https://github.com/containerd/runwasi?tag=containerd-shim-wasm/v0.4.0#5788ced8525a0d2831718f4a24d06fb4d5af6afb" dependencies = [ "anyhow", "caps", @@ -1873,9 +1872,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1888,9 +1887,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1898,15 +1897,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1916,9 +1915,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1937,9 +1936,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -1948,21 +1947,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2932,6 +2931,9 @@ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] [[package]] name = "lru" @@ -3245,10 +3247,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -3914,7 +3917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" dependencies = [ "libc", - "nix 0.27.1", + "nix 0.22.3", ] [[package]] @@ -6110,7 +6113,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand 0.8.5", "static_assertions", ] @@ -6232,6 +6235,12 @@ dependencies = [ "getrandom 0.2.10", ] +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + [[package]] name = "vaultrs" version = "0.6.2" diff --git a/containerd-shim-spin-v1/Cargo.toml b/containerd-shim-spin-v1/Cargo.toml index 4e746fab..f841eae8 100644 --- a/containerd-shim-spin-v1/Cargo.toml +++ b/containerd-shim-spin-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-spin-v1" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' @@ -11,7 +11,7 @@ Containerd shim for running Spin workloads. """ [dependencies] -containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "5a0a47a9ad79f7ae19153897486b8621c8d6a58e" } +containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" } log = "0.4" spin-app = { git = "https://github.com/fermyon/spin", tag = "v1.5.0" } spin-core = { git = "https://github.com/fermyon/spin", tag = "v1.5.0" } diff --git a/containerd-shim-spin-v1/build.rs b/containerd-shim-spin-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-spin-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/containerd-shim-wws-v1/Cargo.lock b/containerd-shim-wws-v1/Cargo.lock index ac87dabd..abac7f02 100644 --- a/containerd-shim-wws-v1/Cargo.lock +++ b/containerd-shim-wws-v1/Cargo.lock @@ -658,14 +658,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cgroups-rs" -version = "0.2.11" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2" +checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" dependencies = [ "libc", "log", - "nix 0.24.3", + "nix 0.25.1", "regex", + "thiserror", ] [[package]] @@ -779,9 +780,9 @@ dependencies = [ [[package]] name = "containerd-shim" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a08af6d8436b911bd47f34dd3478fe28cfbe40e8e3b2c1d61f3abb264e053d" +checksum = "063d0e137d508846210c2f8b6c6dc3db9f1abd4c20b0a9aecdb962385dcb7899" dependencies = [ "cgroups-rs", "command-fds", @@ -791,14 +792,12 @@ dependencies = [ "libc", "log", "mio", - "nix 0.26.4", + "nix 0.27.1", "oci-spec", "os_pipe", "page_size", "prctl", - "regex", "serde", - "serde_derive", "serde_json", "signal-hook", "thiserror", @@ -808,9 +807,9 @@ dependencies = [ [[package]] name = "containerd-shim-protos" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105ad6d5b553163181f33abdb172e1b1f5f567570632258be016acb09ab9578c" +checksum = "967dbd2804aceb398bd7d867410342d68b9d74c1fead823ad8353b3ab5f23eb7" dependencies = [ "protobuf 3.2.0", "ttrpc", @@ -819,8 +818,8 @@ dependencies = [ [[package]] name = "containerd-shim-wasm" -version = "0.3.0" -source = "git+https://github.com/containerd/runwasi?rev=5a0a47a9ad79f7ae19153897486b8621c8d6a58e#5a0a47a9ad79f7ae19153897486b8621c8d6a58e" +version = "0.4.0" +source = "git+https://github.com/containerd/runwasi?tag=containerd-shim-wasm/v0.4.0#5788ced8525a0d2831718f4a24d06fb4d5af6afb" dependencies = [ "anyhow", "caps", @@ -848,7 +847,7 @@ dependencies = [ [[package]] name = "containerd-shim-wws-v1" -version = "0.9.1" +version = "0.9.2" dependencies = [ "anyhow", "containerd-shim-wasm", @@ -2213,6 +2212,9 @@ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] [[package]] name = "mach" @@ -2359,10 +2361,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -4053,6 +4056,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/containerd-shim-wws-v1/Cargo.toml b/containerd-shim-wws-v1/Cargo.toml index b92a9bb8..80191d17 100644 --- a/containerd-shim-wws-v1/Cargo.toml +++ b/containerd-shim-wws-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-wws-v1" -version = "0.9.1" +version = "0.9.2" authors = ["Wasm Labs team "] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' @@ -14,7 +14,7 @@ Containerd shim for running Wasm Workers Server workloads. [dependencies] anyhow = "1.0" -containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "5a0a47a9ad79f7ae19153897486b8621c8d6a58e" } +containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", tag = "containerd-shim-wasm/v0.4.0" } wasm-workers-server = { git = "https://github.com/vmware-labs/wasm-workers-server", tag = "v1.7.0" } log = "0.4" tokio = { version = "1", features = [ "full" ] } diff --git a/containerd-shim-wws-v1/build.rs b/containerd-shim-wws-v1/build.rs deleted file mode 100644 index e5e6ae0b..00000000 --- a/containerd-shim-wws-v1/build.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::process::Command; -use std::str::from_utf8; - -fn main() { - let output = match Command::new("git").arg("rev-parse").arg("HEAD").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - let mut hash = from_utf8(&output.stdout).unwrap().trim().to_string(); - - let output_dirty = match Command::new("git").arg("diff").arg("--exit-code").output() { - Ok(output) => output, - Err(_) => { - return; - } - }; - - if !output_dirty.status.success() { - hash.push_str(".m"); - } - println!("cargo:rustc-env=CARGO_GIT_HASH={}", hash); -} diff --git a/deployments/k3d/README.md b/deployments/k3d/README.md index 14856665..fdd6c96c 100644 --- a/deployments/k3d/README.md +++ b/deployments/k3d/README.md @@ -17,7 +17,7 @@ $ tree . ## How to run the example The shell script below will create a k3d cluster locally with the Wasm shims installed and containerd configured. The script then applies the runtime classes for the shims and an example service and deployment. Finally, we curl the `/hello` and receive a response from the example workload. ```shell -k3d cluster create wasm-cluster --image ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:v0.9.1 -p "8081:80@loadbalancer" --agents 2 +k3d cluster create wasm-cluster --image ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:v0.9.2 -p "8081:80@loadbalancer" --agents 2 kubectl apply -f https://github.com/deislabs/containerd-wasm-shims/raw/main/deployments/workloads/runtime.yaml kubectl apply -f https://github.com/deislabs/containerd-wasm-shims/raw/main/deployments/workloads/workload.yaml echo "waiting 5 seconds for workload to be ready" diff --git a/deployments/workloads/workload.yaml b/deployments/workloads/workload.yaml index 1ebb0284..a6fa103f 100644 --- a/deployments/workloads/workload.yaml +++ b/deployments/workloads/workload.yaml @@ -15,7 +15,7 @@ spec: runtimeClassName: wasmtime-slight containers: - name: slight-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.9.2 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -54,7 +54,7 @@ spec: runtimeClassName: wasmtime-spin containers: - name: spin-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/spin-rust-hello:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/spin-rust-hello:v0.9.2 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -93,7 +93,7 @@ spec: runtimeClassName: wasmtime-wws containers: - name: wws-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/wws-js-hello:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/wws-js-hello:v0.9.2 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -132,7 +132,7 @@ spec: runtimeClassName: wasmtime-lunatic containers: - name: lunatic - image: ghcr.io/deislabs/containerd-wasm-shims/examples/lunatic-submillisecond:v0.9.1 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/lunatic-submillisecond:v0.9.2 resources: # limit the resources to 128Mi of memory and 100m of CPU limits: cpu: 100m diff --git a/images/slight/Cargo.toml b/images/slight/Cargo.toml index 712c523d..e4dd324a 100644 --- a/images/slight/Cargo.toml +++ b/images/slight/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "http-server-lib" -version = "0.9.1" +version = "0.9.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/images/spin-outbound-redis/Cargo.toml b/images/spin-outbound-redis/Cargo.toml index 9cca9227..09515243 100644 --- a/images/spin-outbound-redis/Cargo.toml +++ b/images/spin-outbound-redis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-outbound-redis" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021" diff --git a/images/spin/Cargo.toml b/images/spin/Cargo.toml index 5759d7a9..7a81ae78 100644 --- a/images/spin/Cargo.toml +++ b/images/spin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-rust-hello" -version = "0.9.1" +version = "0.9.2" authors = ["DeisLabs Engineering Team"] edition = "2021"