Skip to content

Commit eda04b0

Browse files
committed
containerd use correct platform for building
Signed-off-by: James Sturtevant <[email protected]>
1 parent 94003ca commit eda04b0

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Diff for: crates/containerd-shim-wasm/src/sandbox/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub enum Error {
4747
#[error("{0}")]
4848
Libcontainer(#[from] libcontainer::error::LibcontainerError),
4949
#[error("{0}")]
50-
Containerd(String)
50+
Containerd(String),
5151
}
5252

5353
pub type Result<T> = ::std::result::Result<T, Error>;

Diff for: crates/containerd-shim-wasm/src/sys/unix/container/instance.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ use nix::unistd::Pid;
1616
use crate::container::Engine;
1717
use crate::sandbox::instance_utils::{determine_rootdir, get_instance_root, instance_exists};
1818
use crate::sandbox::sync::WaitableCell;
19-
use crate::sandbox::{containerd, Error as SandboxError, Instance as SandboxInstance, InstanceConfig, Stdio};
19+
use crate::sandbox::{
20+
containerd, Error as SandboxError, Instance as SandboxInstance, InstanceConfig, Stdio,
21+
};
2022
use crate::sys::container::executor::Executor;
2123

2224
static DEFAULT_CONTAINER_ROOT_DIR: &str = "/run/containerd";

Diff for: test/k8s/Dockerfile.oci

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
ARG KIND_NODE_VERSION=v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
44
ARG RUNTIME=wasmtime
5-
ARG GO_VERSION="1.21.1"
5+
ARG GO_VERSION="1.21.3-bullseye"
66

77
# modified from https://github.com/kubernetes-sigs/kind/blob/main/images/base/Dockerfile
88
# stage for building containerd

0 commit comments

Comments
 (0)