diff --git a/crates/containerd-shim-wasm/src/sandbox/error.rs b/crates/containerd-shim-wasm/src/sandbox/error.rs index e111dcf9d..a9a87f0c0 100644 --- a/crates/containerd-shim-wasm/src/sandbox/error.rs +++ b/crates/containerd-shim-wasm/src/sandbox/error.rs @@ -47,7 +47,7 @@ pub enum Error { #[error("{0}")] Libcontainer(#[from] libcontainer::error::LibcontainerError), #[error("{0}")] - Containerd(String) + Containerd(String), } pub type Result = ::std::result::Result; diff --git a/crates/containerd-shim-wasm/src/sys/unix/container/instance.rs b/crates/containerd-shim-wasm/src/sys/unix/container/instance.rs index 4d07c52d4..dbca437a0 100644 --- a/crates/containerd-shim-wasm/src/sys/unix/container/instance.rs +++ b/crates/containerd-shim-wasm/src/sys/unix/container/instance.rs @@ -16,7 +16,9 @@ use nix::unistd::Pid; use crate::container::Engine; use crate::sandbox::instance_utils::{determine_rootdir, get_instance_root, instance_exists}; use crate::sandbox::sync::WaitableCell; -use crate::sandbox::{containerd, Error as SandboxError, Instance as SandboxInstance, InstanceConfig, Stdio}; +use crate::sandbox::{ + containerd, Error as SandboxError, Instance as SandboxInstance, InstanceConfig, Stdio, +}; use crate::sys::container::executor::Executor; static DEFAULT_CONTAINER_ROOT_DIR: &str = "/run/containerd"; diff --git a/test/k8s/Dockerfile.oci b/test/k8s/Dockerfile.oci index 4583215e5..669aea727 100644 --- a/test/k8s/Dockerfile.oci +++ b/test/k8s/Dockerfile.oci @@ -2,7 +2,7 @@ ARG KIND_NODE_VERSION=v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 ARG RUNTIME=wasmtime -ARG GO_VERSION="1.21.1" +ARG GO_VERSION="1.21.3-bullseye" # modified from https://github.com/kubernetes-sigs/kind/blob/main/images/base/Dockerfile # stage for building containerd