refactor cross container and enable seccomp

Signed-off-by: Jorge Prendes <[email protected]>
deislabs · Oct 24, 2023 · d2efdc3 · d2efdc3
1 parent 50dd14f
commit d2efdc3
Show file tree

Hide file tree

Showing 21 changed files with 171 additions and 95 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
       - name: "Install dependencies"
         run: |
           sudo apt-get update
-          sudo apt-get install protobuf-compiler -y
+          sudo apt-get install -y protobuf-compiler libseccomp-dev
       - name: build ${{ matrix.shims }}
         run: |
           VERBOSE=1 make build SHIMS=${{ matrix.shims }}

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: "Install dependencies"
         run: |
           sudo apt-get update
-          sudo apt-get install protobuf-compiler -y
+          sudo apt-get install -y protobuf-compiler libseccomp-dev
       - name: fmt
         run: |
           make fmt

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-app = { git = "https://github.com/fermyon/spin", tag = "v1.5.0" }
 spin-core = { 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