From 3bc7fc61f6f12f680bf11335e6456d452649ccdd Mon Sep 17 00:00:00 2001 From: Adarsh Date: Thu, 23 Jan 2025 07:36:07 +0000 Subject: [PATCH 1/5] Update java-simple example Signed-off-by: Adarsh --- Examples/java-simple/Dockerfile | 2 +- Examples/java-simple/README.md | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Examples/java-simple/Dockerfile b/Examples/java-simple/Dockerfile index 2af04321..046c7885 100644 --- a/Examples/java-simple/Dockerfile +++ b/Examples/java-simple/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11 +FROM openjdk:25-jdk-bookworm COPY JavaExample.java . diff --git a/Examples/java-simple/README.md b/Examples/java-simple/README.md index 4565350e..5c94f141 100644 --- a/Examples/java-simple/README.md +++ b/Examples/java-simple/README.md @@ -9,37 +9,35 @@ using GSC. For more information on Java, please visit https://www.oracle.com/jav * Tested on: - Type: Azure Confidential Computing SGX Virtual Machine - Size: Standard DC1s v3 (1 vCPU, 8 GiB memory) - - OS: Linux (Ubuntu 20.04) - - OpenJDK 11 + - OS: Linux (Ubuntu 24.04) + - openjdk:25-jdk-bookworm ## Build and run graminized Docker image 1. Build Docker image: ```bash -$ docker build -t openjdk-11-java-simple . +docker build -t openjdk-25-java-simple . ``` 2. Graminize the Docker image (this step can take some time!): ```bash -$ (cd ../.. && ./gsc build openjdk-11-java-simple \ - Examples/java-simple/java-simple.manifest \ - -c ) +(cd ../.. && ./gsc build openjdk-25-java-simple \ + Examples/java-simple/java-simple.manifest ) ``` 3. Sign the graminized Docker image: ```bash -$ (cd ../.. && ./gsc sign-image openjdk-11-java-simple \ - \ - -c ) +(cd ../.. && ./gsc sign-image openjdk-25-java-simple \ + ) ``` 4. Run graminized image: ```bash -$ docker run --rm --device=/dev/sgx_enclave \ +docker run --rm --device=/dev/sgx_enclave \ -v /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket \ - gsc-openjdk-11-java-simple + gsc-openjdk-25-java-simple ``` From 2e80a510868bc0dbe218c6c173544c3f22300e43 Mon Sep 17 00:00:00 2001 From: Adarsh Date: Fri, 24 Jan 2025 05:51:27 +0000 Subject: [PATCH 2/5] fixup! Update java-simple example Signed-off-by: Adarsh --- Examples/java-simple/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/java-simple/Dockerfile b/Examples/java-simple/Dockerfile index 046c7885..9a9a91ac 100644 --- a/Examples/java-simple/Dockerfile +++ b/Examples/java-simple/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:25-jdk-bookworm +FROM openjdk:24-jdk-bookworm COPY JavaExample.java . From 86642529d973da60826293733f98b6fa483e1a58 Mon Sep 17 00:00:00 2001 From: Adarsh Date: Fri, 24 Jan 2025 05:52:02 +0000 Subject: [PATCH 3/5] fixup! Update java-simple example Signed-off-by: Adarsh --- Examples/java-simple/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Examples/java-simple/README.md b/Examples/java-simple/README.md index 5c94f141..38c46973 100644 --- a/Examples/java-simple/README.md +++ b/Examples/java-simple/README.md @@ -10,27 +10,27 @@ using GSC. For more information on Java, please visit https://www.oracle.com/jav - Type: Azure Confidential Computing SGX Virtual Machine - Size: Standard DC1s v3 (1 vCPU, 8 GiB memory) - OS: Linux (Ubuntu 24.04) - - openjdk:25-jdk-bookworm + - openjdk:24-jdk-bookworm ## Build and run graminized Docker image 1. Build Docker image: ```bash -docker build -t openjdk-25-java-simple . +docker build -t openjdk-24-java-simple . ``` 2. Graminize the Docker image (this step can take some time!): ```bash -(cd ../.. && ./gsc build openjdk-25-java-simple \ +(cd ../.. && ./gsc build openjdk-24-java-simple \ Examples/java-simple/java-simple.manifest ) ``` 3. Sign the graminized Docker image: ```bash -(cd ../.. && ./gsc sign-image openjdk-25-java-simple \ +(cd ../.. && ./gsc sign-image openjdk-24-java-simple \ ) ``` @@ -39,5 +39,5 @@ docker build -t openjdk-25-java-simple . ```bash docker run --rm --device=/dev/sgx_enclave \ -v /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket \ - gsc-openjdk-25-java-simple + gsc-openjdk-24-java-simple ``` From c8e7905350d9982feb7dcb308f61115c827c0d67 Mon Sep 17 00:00:00 2001 From: Adarsh Date: Fri, 24 Jan 2025 05:53:00 +0000 Subject: [PATCH 4/5] fixup! Update java-simple example Signed-off-by: Adarsh --- Examples/java-simple/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/java-simple/README.md b/Examples/java-simple/README.md index 38c46973..2eaa823f 100644 --- a/Examples/java-simple/README.md +++ b/Examples/java-simple/README.md @@ -24,14 +24,14 @@ docker build -t openjdk-24-java-simple . ```bash (cd ../.. && ./gsc build openjdk-24-java-simple \ - Examples/java-simple/java-simple.manifest ) + Examples/java-simple/java-simple.manifest) ``` 3. Sign the graminized Docker image: ```bash (cd ../.. && ./gsc sign-image openjdk-24-java-simple \ - ) + ) ``` 4. Run graminized image: From b255e5235eff1222f7aab197b7177f735099582a Mon Sep 17 00:00:00 2001 From: Adarsh Date: Fri, 24 Jan 2025 06:19:55 +0000 Subject: [PATCH 5/5] fixup! Update java-simple example Signed-off-by: Adarsh --- Examples/java-simple/Dockerfile | 2 +- Examples/java-simple/README.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Examples/java-simple/Dockerfile b/Examples/java-simple/Dockerfile index 9a9a91ac..5e0b311f 100644 --- a/Examples/java-simple/Dockerfile +++ b/Examples/java-simple/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:24-jdk-bookworm +FROM openjdk:21-jdk-slim COPY JavaExample.java . diff --git a/Examples/java-simple/README.md b/Examples/java-simple/README.md index 2eaa823f..a6cc9608 100644 --- a/Examples/java-simple/README.md +++ b/Examples/java-simple/README.md @@ -10,27 +10,27 @@ using GSC. For more information on Java, please visit https://www.oracle.com/jav - Type: Azure Confidential Computing SGX Virtual Machine - Size: Standard DC1s v3 (1 vCPU, 8 GiB memory) - OS: Linux (Ubuntu 24.04) - - openjdk:24-jdk-bookworm + - OpenJDK 21 ## Build and run graminized Docker image 1. Build Docker image: ```bash -docker build -t openjdk-24-java-simple . +docker build -t openjdk-21-java-simple . ``` 2. Graminize the Docker image (this step can take some time!): ```bash -(cd ../.. && ./gsc build openjdk-24-java-simple \ +(cd ../.. && ./gsc build openjdk-21-java-simple \ Examples/java-simple/java-simple.manifest) ``` 3. Sign the graminized Docker image: ```bash -(cd ../.. && ./gsc sign-image openjdk-24-java-simple \ +(cd ../.. && ./gsc sign-image openjdk-21-java-simple \ ) ``` @@ -39,5 +39,5 @@ docker build -t openjdk-24-java-simple . ```bash docker run --rm --device=/dev/sgx_enclave \ -v /var/run/aesmd/aesm.socket:/var/run/aesmd/aesm.socket \ - gsc-openjdk-24-java-simple + gsc-openjdk-21-java-simple ```