diff --git a/Cargo.lock b/Cargo.lock index 0d77f6c..9013401 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1572,7 +1572,7 @@ dependencies = [ [[package]] name = "detee-sgx" version = "0.1.0" -source = "git+https://gitea.detee.cloud/general/detee-sgx#f7eaed1392ae79ecc1105a50d919026f016a4e78" +source = "git+https://gitea.detee.cloud/general/detee-sgx?branch=dthc#8ced0efcbac57f118b202785c783f2a7d39bf700" dependencies = [ "aes-gcm", "hex", diff --git a/README.md b/README.md index 4a2ae09..794a6da 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,10 @@ Do the following steps to build the challenge: ```bash # Notice that there is no SGX device mounted, run inside rewrite directory -docker run --rm --name packager -it -v .:/root/rewrite occlum/occlum:latest-ubuntu20.04 +docker run --rm --name packager -it -v .:/root/rewrite detee/occlum:0.30.1-ubuntu20.04 +# If you are running the packager on Mac, don't forget to set the VMM to QEMU (Legacy), +# and run the following command once you are inside the container +ln -s /usr/local/occlum/bin/x86_64-linux-musl-ar /usr/local/occlum/bin/musl-ar # Inside the docker container run package.sh and follow its instructions cd /root/rewrite && ./scripts/package.sh --prep exit # Feel free to exit the container diff --git a/docker/challenge.Dockerfile b/docker/challenge.Dockerfile index ab01f6a..b3c05ab 100644 --- a/docker/challenge.Dockerfile +++ b/docker/challenge.Dockerfile @@ -1,4 +1,4 @@ -FROM occlum/occlum:latest-ubuntu20.04 AS build +FROM detee/occlum:0.30.1-ubuntu20.04 AS build WORKDIR / RUN mkdir sgx_libs &&\ diff --git a/scripts/package.sh b/scripts/package.sh index afeb8c9..a4a2b11 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -7,11 +7,6 @@ cd "$script_dir/.." prerequisites=$1 if [ "$prerequisites" == "--prep" ]; then - echo "Building the occlum fork" - [ -d occlum ] || git clone https://gitea.detee.cloud/general/occlum.git - (cd occlum && make submodule) - (cd occlum/tools/toolchains/utils_lib && ./build.sh) - echo "Preparing the packager environment" apt update && apt install -y openssh-client rustup install 1.84.0