containerd use correct platform for building

Signed-off-by: James Sturtevant <[email protected]>
containerd · Oct 23, 2023 · eda04b0 · eda04b0
1 parent 94003ca
commit eda04b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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<T> = ::std::result::Result<T, Error>;

diff --git 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
@@ -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