From d689e1a6a8d5400b43d7aea802c2490e9fdbb0f8 Mon Sep 17 00:00:00 2001 From: f-hy <89677143+f-hy@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:11:23 +0800 Subject: [PATCH 1/2] Reduce redundancy Update docker_cmd.sh for reducing redundancy. --- docker_cmd.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker_cmd.sh b/docker_cmd.sh index db591c1..b70f36a 100755 --- a/docker_cmd.sh +++ b/docker_cmd.sh @@ -17,9 +17,7 @@ function print_usage() { # no arguments if [ $# == 0 ]; then - echo "Default: building penglai demo image" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 bash scripts/build.sh - exit 0 + set -- "build" fi if [[ $1 == *"help"* ]]; then From 15bdc6ea50dc4551b3756b8388ae2a342ce5c8ff Mon Sep 17 00:00:00 2001 From: f-hy <89677143+f-hy@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:31:27 +0800 Subject: [PATCH 2/2] Reduce redundancy --- docker_cmd.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/docker_cmd.sh b/docker_cmd.sh index b70f36a..bdc3ae5 100755 --- a/docker_cmd.sh +++ b/docker_cmd.sh @@ -1,4 +1,5 @@ #!/bin/bash +enclave_image="ddnirvana/penglai-enclave:v0.4" function print_usage() { RED='\033[0;31m' @@ -15,6 +16,10 @@ function print_usage() { " } +function docker_cmd() { + docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it $enclave_image "$@" +} + # no arguments if [ $# == 0 ]; then set -- "build" @@ -28,35 +33,35 @@ fi # build penglai if [[ $1 == "build" ]]; then echo "Build: building penglai demo image" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 bash scripts/build.sh + docker_cmd bash scripts/build.sh exit 0 fi # build penglai-32-nommu if [[ $1 == "build32" ]]; then echo "Build: building penglai-32-nommu demo image" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 bash scripts/build32.sh + docker_cmd bash scripts/build32.sh exit 0 fi # run penglai if [[ $1 == "qemu" ]]; then echo "Run: run penglai demo image in sPMP-supported Qemu" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 bash scripts/run-qemu.sh + docker_cmd bash scripts/run-qemu.sh exit 0 fi # run penglai if [[ $1 == "qemu32" ]]; then echo "Run: run penglai32-nommu demo image in Qemu" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 bash scripts/run-qemu32.sh + docker_cmd bash scripts/run-qemu32.sh exit 0 fi # run penglai with freertos if [[ $1 == "freertos" ]]; then echo "Run: run freertos demo image in Qemu" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 bash scripts/run-freertos.sh + docker_cmd bash scripts/run-freertos.sh exit 0 fi @@ -64,14 +69,14 @@ fi if [[ $1 == *"docker"* ]]; then echo "Run: run docker" #sudo docker run --privileged --cap-add=ALL -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.2 - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 + docker_cmd exit 0 fi # make clean if [[ $1 == *"clean"* ]]; then echo "Clean: make clean" - docker run -v $(pwd):/home/penglai/penglai-enclave -w /home/penglai/penglai-enclave --rm -it ddnirvana/penglai-enclave:v0.4 make clean + docker_cmd make clean exit 0 fi