Skip to content

Commit

Permalink
Merge pull request #94 from abel-von/support-runc-for-shim
Browse files Browse the repository at this point in the history
[feature] add support of a runc sandboxer
  • Loading branch information
Burning1020 authored Dec 10, 2023
2 parents 7b6c933 + d0bd129 commit 5b5a02d
Show file tree
Hide file tree
Showing 10 changed files with 4,617 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
checks:
strategy:
matrix:
directories: [vmm/sandbox, vmm/task, shim, quark]
directories: [vmm/sandbox, vmm/task, shim, quark, runc]
features: [--all-features]
include:
- directories: wasm
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
tests:
strategy:
matrix:
directories: [vmm/sandbox, vmm/task, shim, quark]
directories: [vmm/sandbox, vmm/task, shim, quark, runc]
features: [--all-features]
include:
- directories: wasm
Expand Down
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,13 @@ bin/quark-sandboxer:
@cd quark && cargo build --release
@mkdir -p bin && cp quark/target/release/quark-sandboxer bin/quark-sandboxer

bin/runc-sandboxer:
@cd runc && cargo build --release
@mkdir -p bin && cp runc/target/release/runc-sandboxer bin/runc-sandboxer

wasm: bin/wasm-sandboxer
quark: bin/quark-sandboxer
runc: bin/runc-sandboxer

ifeq ($(HYPERVISOR), stratovirt)
vmm: bin/vmm-sandboxer bin/kuasar.initrd bin/vmlinux.bin
Expand All @@ -57,6 +62,7 @@ clean:
@cd vmm/task && cargo clean
@cd wasm && cargo clean
@cd quark && cargo clean
@cd runc && cargo clean

install-vmm:
@install -d -m 750 ${DEST_DIR}${BIN_DIR}
Expand Down Expand Up @@ -86,4 +92,7 @@ install-quark:
@install -d -m 750 ${DEST_DIR}${SYSTEMD_SERVICE_DIR}
@install -p -m 640 quark/service/kuasar-quark.service ${DEST_DIR}${SYSTEMD_SERVICE_DIR}/kuasar-quark.service

install: all install-vmm install-wasm install-quark
install-runc:
@install -p -m 550 bin/runc-sandboxer ${DEST_DIR}${BIN_DIR}/runc-sandboxer

install: all install-vmm install-wasm install-quark install-runc
Loading

0 comments on commit 5b5a02d

Please sign in to comment.