From ed2347309aff42f61e959d1cd79a792bc17e7c86 Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Thu, 13 Jun 2024 19:35:54 +0000 Subject: [PATCH 1/2] bump rust to 1.79 Signed-off-by: jiaxiao zhou --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e6553536c..e1107683d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel="1.78.0" +channel="1.79.0" profile="default" targets = ["wasm32-wasi"] From 97da9a6ee15d690eca3350ae9907c7bc4162449a Mon Sep 17 00:00:00 2001 From: jiaxiao zhou Date: Thu, 13 Jun 2024 21:03:22 +0000 Subject: [PATCH 2/2] doc: removed needness main Signed-off-by: jiaxiao zhou --- crates/containerd-shim-wasm/README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/crates/containerd-shim-wasm/README.md b/crates/containerd-shim-wasm/README.md index ef195301d..a9e595e94 100644 --- a/crates/containerd-shim-wasm/README.md +++ b/crates/containerd-shim-wasm/README.md @@ -10,9 +10,7 @@ A library to help build containerd shims for wasm workloads. use containerd_shim as shim; use containerd_shim_wasm::sandbox::{ShimCli, Instance, Nop} -fn main() { - shim::run::>("io.containerd.nop.v1", opts); -} +shim::run::>("io.containerd.nop.v1", opts); ``` The above example uses the built-in `Nop` instance which does nothing. @@ -30,9 +28,7 @@ impl Instance for MyInstance { // ... } -fn main() { - shim::run::>("io.containerd.myshim.v1", opts); -} +shim::run::>("io.containerd.myshim.v1", opts); ``` containerd expects the shim binary to be installed into `$PATH` (as seen by the containerd process) with a binary name like `containerd-shim-myshim-v1` which maps to the `io.containerd.myshim.v1` runtime which would need to be configured in containerd. It (containerd) also supports specifying a path to the shim binary but needs to be configured to do so.