refactor cross container and enable seccomp

Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>
deislabs · Sep 25, 2023 · 1fd2964 · 1fd2964
1 parent fd40db4
commit 1fd2964
Show file tree

Hide file tree

Showing 19 changed files with 168 additions and 93 deletions.
diff --git a/containerd-shim-lunatic-v1/Cargo.toml b/containerd-shim-lunatic-v1/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 containerd-shim = "0.5.0"
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "4d212b968d24d42a27952e8b04979382b543a613", features = ["cgroupsv2"] }
+containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "4d212b968d24d42a27952e8b04979382b543a613", features = ["cgroupsv1", "cgroupsv2"] }
 log = "~0.4"
 anyhow = "1.0.72"
 chrono = { version = "0.4.26", features = ["std"] }

diff --git a/containerd-shim-lunatic-v1/Cross.toml b/containerd-shim-lunatic-v1/Cross.toml
@@ -2,7 +2,7 @@
 default-target = "x86_64-unknown-linux-musl"
 
 [target.x86_64-unknown-linux-musl]
-dockerfile = "./containerd-shim-lunatic-v1/Dockerfile"
+dockerfile = "./cross/Dockerfile"
 
 [target.aarch64-unknown-linux-musl]
-dockerfile = "./containerd-shim-lunatic-v1/Dockerfile"
+dockerfile = "./cross/Dockerfile"
diff --git a/containerd-shim-lunatic-v1/Dockerfile b/containerd-shim-lunatic-v1/Dockerfile
diff --git a/containerd-shim-slight-v1/Cargo.toml b/containerd-shim-slight-v1/Cargo.toml
@@ -12,7 +12,7 @@ Containerd shim for running Slight workloads.
 
 [dependencies]
 containerd-shim = "0.5.0"
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "4d212b968d24d42a27952e8b04979382b543a613", features = ["cgroupsv2"] }
+containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "4d212b968d24d42a27952e8b04979382b543a613", features = ["cgroupsv1", "cgroupsv2"] }
 log = "0.4"
 tokio = { version = "1", features = [ "full" ] }
 slight = { git = "https://github.com/deislabs/spiderlightning", version = "0.5.1" }

diff --git a/containerd-shim-slight-v1/Cross.toml b/containerd-shim-slight-v1/Cross.toml
@@ -2,7 +2,7 @@
 default-target = "x86_64-unknown-linux-musl"
 
 [target.x86_64-unknown-linux-musl]
-dockerfile = "./containerd-shim-slight-v1/Dockerfile"
+dockerfile = "./cross/Dockerfile"
 
 [target.aarch64-unknown-linux-musl]
-dockerfile = "./containerd-shim-slight-v1/Dockerfile"
+dockerfile = "./cross/Dockerfile"
diff --git a/containerd-shim-slight-v1/Dockerfile b/containerd-shim-slight-v1/Dockerfile
diff --git a/containerd-shim-spin-v1/Cargo.lock b/containerd-shim-spin-v1/Cargo.lock
diff --git a/containerd-shim-spin-v1/Cargo.toml b/containerd-shim-spin-v1/Cargo.toml
@@ -12,7 +12,7 @@ Containerd shim for running Spin workloads.
 
 [dependencies]
 containerd-shim = "0.5.0"
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "4d212b968d24d42a27952e8b04979382b543a613", features = ["cgroupsv2"] }
+containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "4d212b968d24d42a27952e8b04979382b543a613", features = ["cgroupsv1", "cgroupsv2"] }
 log = "0.4"
 spin-trigger = { git = "https://github.com/fermyon/spin", tag = "v1.5.0" }
 spin-trigger-http = { git = "https://github.com/fermyon/spin", tag = "v1.5.0" }

diff --git a/containerd-shim-spin-v1/Cross.toml b/containerd-shim-spin-v1/Cross.toml
@@ -2,9 +2,7 @@
 default-target = "x86_64-unknown-linux-musl"
 
 [target.x86_64-unknown-linux-musl]
-dockerfile.file = "./containerd-shim-spin-v1/Dockerfile"
-dockerfile.context = "./containerd-shim-spin-v1/polyfill/"
+dockerfile = "./cross/Dockerfile"
 
 [target.aarch64-unknown-linux-musl]
-dockerfile.file = "./containerd-shim-spin-v1/Dockerfile"
-dockerfile.context = "./containerd-shim-spin-v1/polyfill/"
+dockerfile = "./cross/Dockerfile"
diff --git a/containerd-shim-spin-v1/Dockerfile b/containerd-shim-spin-v1/Dockerfile
diff --git a/containerd-shim-spin-v1/polyfill/README.md b/containerd-shim-spin-v1/polyfill/README.md
diff --git a/containerd-shim-spin-v1/polyfill/polyfill.sh b/containerd-shim-spin-v1/polyfill/polyfill.sh
diff --git a/containerd-shim-spin-v1/polyfill/polyfill_vld1q_s8_x4.h b/containerd-shim-spin-v1/polyfill/polyfill_vld1q_s8_x4.h