Merge pull request #741 from utam0k/feature/remove-original-libseccomp

Use the libseccomp-rs/libseccomp-rs crate instead of youki original libseccomp-rs.
youki-dev · Mar 5, 2022 · ba9215c · ba9215c
2 parents cb3e487 + 5916ff3
commit ba9215c
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 999 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,6 @@ jobs:
             ./crates/youki: crates/youki/**
             ./crates/libcontainer: crates/libcontainer/**
             ./crates/libcgroups: crates/libcgroups/**
-            ./crates/libseccomp: crates/libseccomp/**
             ./crates/integration_test: crates/integration_test/**
             ./runtimetest : runtimetest/**
   check:
@@ -93,7 +92,7 @@ jobs:
         run: |
           cargo llvm-cov clean --workspace
           cargo llvm-cov --no-report
-          cargo llvm-cov --no-run --lcov --ignore-filename-regex "libseccomp/src|integration_test/src|test_framework/src|systemd_api.rs" --output-path ./coverage.lcov
+          cargo llvm-cov --no-run --lcov --ignore-filename-regex "integration_test/src|test_framework/src|systemd_api.rs" --output-path ./coverage.lcov
       - name: Upload Youki Code Coverage Results
         uses: codecov/codecov-action@v2
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml
@@ -34,7 +34,7 @@ path-clean = "0.1.0"
 procfs = "0.12.0"
 prctl = "1.0.0"
 libcgroups = { version = "0.0.2", path = "../libcgroups" }
-libseccomp = { version = "0.0.2", path = "../libseccomp" }
+libseccomp = { version = "0.2.3" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 rust-criu = { git = "https://github.com/checkpoint-restore/rust-criu", version = "0.1.0" }

diff --git a/crates/libcontainer/src/seccomp/fixture/config.json b/crates/libcontainer/src/seccomp/fixture/config.json
@@ -961,4 +961,4 @@
             "/proc/sysrq-trigger"
         ]
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -961,4 +961,4 @@ @@
                 "/proc/sysrq-trigger"
             ]
         }
-    }
+    }