From 2ffda3b19a74560f19fd752f49c86d453bea45be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Tue, 27 Feb 2024 17:16:48 +0100 Subject: [PATCH] Update samples to Gramine v1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- samples/gramine-hello/README.md | 2 +- samples/gramine-nginx/README.md | 2 +- samples/gramine-redis/Dockerfile | 4 ++-- samples/gramine-redis/README.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/gramine-hello/README.md b/samples/gramine-hello/README.md index 780c3d37..f12f1768 100644 --- a/samples/gramine-hello/README.md +++ b/samples/gramine-hello/README.md @@ -4,7 +4,7 @@ This example shows how to run a [Gramine](https://github.com/gramineproject/gram ## Requirements -First, install Gramine on [release v1.5](https://github.com/gramineproject/gramine/releases/tag/v1.5). You will need hardware with Intel SGX support. +First, [install Gramine](https://github.com/gramineproject/gramine/releases). You will need hardware with Intel SGX support. Then, before you can run the example, make sure you got the prerequisites for ECDSA remote attestation installed on your system. You can collectively install them with the following command: diff --git a/samples/gramine-nginx/README.md b/samples/gramine-nginx/README.md index 87a887f8..ff99a770 100644 --- a/samples/gramine-nginx/README.md +++ b/samples/gramine-nginx/README.md @@ -2,7 +2,7 @@ This example is a slightly modified variant of the [Gramine nginx example](https://github.com/gramineproject/gramine/tree/master/CI-Examples/nginx). These changes are required to run it with MarbleRun. -*Prerequisite*: Gramine is installed on [release v1.5](https://github.com/gramineproject/gramine/releases/tag/v1.5) and the original nginx example is working. You will need hardware with Intel SGX support, and the Coordinator must not run in simulation mode. +*Prerequisite*: [Gramine is installed](https://github.com/gramineproject/gramine/releases) and the [original nginx example](https://github.com/gramineproject/gramine/tree/master/CI-Examples/nginx) is working. You will need hardware with Intel SGX support, and the Coordinator must not run in simulation mode. To marbleize the example we edited [nginx.manifest.template](nginx.manifest.template). See comments starting with `MARBLERUN` for explanations of the required changes. diff --git a/samples/gramine-redis/Dockerfile b/samples/gramine-redis/Dockerfile index 6d95e378..24ab25ac 100644 --- a/samples/gramine-redis/Dockerfile +++ b/samples/gramine-redis/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /premain/build RUN cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. RUN make premain-libos -FROM gramineproject/gramine:v1.5 AS release +FROM gramineproject/gramine:1.6-jammy AS release RUN apt-get update && apt-get install -y \ wget \ libssl-dev \ @@ -26,5 +26,5 @@ COPY ./redis-server.manifest.template ./start.sh /gramine/CI-Examples/redis/ WORKDIR /gramine/CI-Examples/redis/ ENV BUILD_TLS yes RUN --mount=type=secret,id=signingkey,dst=/root/.config/gramine/enclave-key.pem,required=true \ - make clean && make SGX=1 + make clean && make SGX=1 && chmod +x start.sh ENTRYPOINT [ "/gramine/CI-Examples/redis/start.sh" ] diff --git a/samples/gramine-redis/README.md b/samples/gramine-redis/README.md index 34321d60..caf14212 100644 --- a/samples/gramine-redis/README.md +++ b/samples/gramine-redis/README.md @@ -38,7 +38,7 @@ First, we are installing MarbleRun on your cluster. * Check Coordinator's status, this should return status `2: ready to accept manifest`. ```bash - marblerun status $MARBLERUN + marblerun status $MARBLERUN --insecure ``` * Set the [manifest](manifest.json)