Merge pull request #198 from mythi/jammy

Move to Ubuntu 22.04 based bundle
confidential-containers · Aug 26, 2024 · de1bae6 · de1bae6
2 parents 4189dda + f16d0fc
commit de1bae6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/runtime-boot/init/src/main.rs b/src/runtime-boot/init/src/main.rs
@@ -24,8 +24,8 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let ret = match agent_boot {
         true => {
-            let root_config_ptr: *const i8 = std::ptr::null();
-            unsafe { syscall(SYS_MOUNT_FS, root_config_ptr) }
+            let null_ptr: *const i8 = std::ptr::null();
+            unsafe { syscall(SYS_MOUNT_FS, null_ptr, null_ptr) }
         }
         false => {
             let rootfs_upper_layer = "/sefs/upper";

diff --git a/tools/packaging/build/unified-bundle/Dockerfile b/tools/packaging/build/unified-bundle/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as builder
+FROM ubuntu:22.04 as builder
 
 ARG KBC=cc-kbc
 
@@ -10,14 +10,14 @@ RUN apt-get update && \
     wget \
     gnupg
 
-ARG OCCLUM_VERSION=0.30.1-focal-1
+ARG OCCLUM_VERSION=0.30.1-jammy-1
 ARG SGXSDK_VERSION=2_23_100
 ARG RUST_VERSION=1.76.0
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=${RUST_VERSION}
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" | tee -a /etc/apt/sources.list.d/intel-sgx.list \
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" | tee -a /etc/apt/sources.list.d/intel-sgx.list \
  && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg \
- && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/apt_preference_files/99sgx_${SGXSDK_VERSION}_focal_custom_version.cfg | tee -a /etc/apt/preferences.d/99sgx_sdk \
+ && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/apt_preference_files/99sgx_${SGXSDK_VERSION}_jammy_custom_version.cfg | tee -a /etc/apt/preferences.d/99sgx_sdk \
  && apt-get update \
  && env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     libsgx-uae-service \
@@ -28,7 +28,7 @@ RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://d
     libsgx-quote-ex \
     libsgx-dcap-default-qpl
 
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/occlum.gpg] https://occlum.io/occlum-package-repos/debian focal main" | tee -a /etc/apt/sources.list.d/occlum.list \
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/occlum.gpg] https://occlum.io/occlum-package-repos/debian jammy main" | tee -a /etc/apt/sources.list.d/occlum.list \
  && wget -qO - https://occlum.io/occlum-package-repos/debian/public.key | gpg --dearmor --output /usr/share/keyrings/occlum.gpg \
  && apt-get update
 RUN env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -80,22 +80,22 @@ RUN export PATH="$PATH:/opt/occlum/build/bin" && \
         export DEBUG="--debug"; \
     fi; occlum package ${DEBUG}
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     ca-certificates \
     wget \
     gnupg
 
-ARG OCCLUM_VERSION=0.30.1-focal-1
+ARG OCCLUM_VERSION=0.30.1-jammy-1
 ARG SGXSDK_VERSION=2_23_100
 
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" | tee -a /etc/apt/sources.list.d/intel-sgx.list \
- && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/occlum.gpg] https://occlum.io/occlum-package-repos/debian focal main" | tee -a /etc/apt/sources.list.d/occlum.list \
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" | tee -a /etc/apt/sources.list.d/intel-sgx.list \
+ && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/occlum.gpg] https://occlum.io/occlum-package-repos/debian jammy main" | tee -a /etc/apt/sources.list.d/occlum.list \
  && wget -qO - https://occlum.io/occlum-package-repos/debian/public.key | gpg --dearmor --output /usr/share/keyrings/occlum.gpg \
  && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg \
- && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/apt_preference_files/99sgx_${SGXSDK_VERSION}_focal_custom_version.cfg | tee -a /etc/apt/preferences.d/99sgx_sdk \
+ && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/apt_preference_files/99sgx_${SGXSDK_VERSION}_jammy_custom_version.cfg | tee -a /etc/apt/preferences.d/99sgx_sdk \
  && apt-get update \
  && env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     libsgx-uae-service \

diff --git a/tools/packaging/build/unified-bundle/enclave-agent-cc-kbc.yaml b/tools/packaging/build/unified-bundle/enclave-agent-cc-kbc.yaml
@@ -14,9 +14,9 @@ targets:
       - files:
          - /opt/occlum/glibc/lib/libnss_files.so.2
          - /opt/occlum/glibc/lib/libnss_dns.so.2
+         - /opt/occlum/glibc/lib/libresolv.so.2
+         - /opt/occlum/glibc/lib/librt.so.1
          - /lib/x86_64-linux-gnu/libdl.so.2
-         - /usr/lib/x86_64-linux-gnu/libssl.so.1.1
-         - /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
   - target: /usr/lib/ssl
     copy:
       - dirs:

diff --git a/tools/packaging/build/unified-bundle/enclave-agent-sample-kbc.yaml b/tools/packaging/build/unified-bundle/enclave-agent-sample-kbc.yaml
@@ -14,9 +14,9 @@ targets:
       - files:
          - /opt/occlum/glibc/lib/libnss_files.so.2
          - /opt/occlum/glibc/lib/libnss_dns.so.2
+         - /opt/occlum/glibc/lib/libresolv.so.2
+         - /opt/occlum/glibc/lib/librt.so.1
          - /lib/x86_64-linux-gnu/libdl.so.2
-         - /usr/lib/x86_64-linux-gnu/libssl.so.1.1
-         - /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
   - target: /usr/lib/ssl
     copy:
       - dirs: