Skip to content

Commit

Permalink
Merge pull request #622 from Mossaka/bump-rust-1.79
Browse files Browse the repository at this point in the history
chore: bump rust to 1.79
  • Loading branch information
Mossaka committed Jun 20, 2024
2 parents 12fd000 + 97da9a6 commit fdaaa3c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions crates/containerd-shim-wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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::<ShimCli<Nop>>("io.containerd.nop.v1", opts);
}
shim::run::<ShimCli<Nop>>("io.containerd.nop.v1", opts);
```

The above example uses the built-in `Nop` instance which does nothing.
Expand All @@ -30,9 +28,7 @@ impl Instance for MyInstance {
// ...
}

fn main() {
shim::run::<ShimCli<MyInstance>>("io.containerd.myshim.v1", opts);
}
shim::run::<ShimCli<MyInstance>>("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.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel="1.78.0"
channel="1.79.0"
profile="default"
targets = ["wasm32-wasi"]

0 comments on commit fdaaa3c

Please sign in to comment.