switch to detee occlum

Signed-off-by: Valentyn Faychuk <valy@detee.ltd>
This commit is contained in:
Valentyn Faychuk 2025-01-22 04:06:50 +02:00
parent 17cb3342ad
commit 48803d4e89
Signed by: valy
GPG Key ID: F1AB995E20FEADC5
4 changed files with 6 additions and 8 deletions

2
Cargo.lock generated

@ -1572,7 +1572,7 @@ dependencies = [
[[package]] [[package]]
name = "detee-sgx" name = "detee-sgx"
version = "0.1.0" 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 = [ dependencies = [
"aes-gcm", "aes-gcm",
"hex", "hex",

@ -8,7 +8,10 @@ Do the following steps to build the challenge:
```bash ```bash
# Notice that there is no SGX device mounted, run inside rewrite directory # 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 # Inside the docker container run package.sh and follow its instructions
cd /root/rewrite && ./scripts/package.sh --prep cd /root/rewrite && ./scripts/package.sh --prep
exit # Feel free to exit the container exit # Feel free to exit the container

@ -1,4 +1,4 @@
FROM occlum/occlum:latest-ubuntu20.04 AS build FROM detee/occlum:0.30.1-ubuntu20.04 AS build
WORKDIR / WORKDIR /
RUN mkdir sgx_libs &&\ RUN mkdir sgx_libs &&\

@ -7,11 +7,6 @@ cd "$script_dir/.."
prerequisites=$1 prerequisites=$1
if [ "$prerequisites" == "--prep" ]; then 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" echo "Preparing the packager environment"
apt update && apt install -y openssh-client apt update && apt install -y openssh-client
rustup install 1.84.0 rustup install 1.84.0