diff --git a/deployment/dockerfiles/base-images/app.Dockerfile b/deployment/dockerfiles/base-images/app.Dockerfile index 10869753a..2ee005dd2 100644 --- a/deployment/dockerfiles/base-images/app.Dockerfile +++ b/deployment/dockerfiles/base-images/app.Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:focal as runtime_base +FROM ubuntu:jammy as runtime_base LABEL maintainer=enigmampc # SGX version parameters ARG SDK_VERSION=2.20 ARG SGX_VERSION=2.20.100.4 -ARG PSW_VERSION=2.20.100.4-focal1 -ARG OS_REVESION=focal1 -ARG DCAP_VERSION=1.17.100.4-focal1 +ARG PSW_VERSION=2.20.100.4-jammy1 +ARG OS_REVESION=jammy1 +ARG DCAP_VERSION=1.17.100.4-jammy1 #RUN apt-get update && \ # apt-get install -y --no-install-recommends \ # #### Base utilities #### @@ -32,9 +32,9 @@ RUN mkdir /etc/init && \ RUN apt-get update && \ - apt-get install -y gnupg2 apt-transport-https ca-certificates curl software-properties-common make g++ libcurl4 libssl1.1 && \ + apt-get install -y gnupg2 apt-transport-https ca-certificates curl software-properties-common make g++ libcurl4 libssl3 && \ curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - && \ - add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" && \ + add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" && \ apt-get update && \ apt-get install -y \ libsgx-aesm-launch-plugin=$PSW_VERSION \ @@ -82,7 +82,8 @@ RUN apt-get update && \ #RUN apt-get install libsgx-epid libsgx-quote-ex libsgx-dcap-ql # -ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/ +ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu22.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/ +# ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/ ## ADD https://download.01.org/intel-sgx/sgx-linux/2.9.1/distro/ubuntu18.04-server/sgx_linux_x64_driver_2.6.0_95eaa6f.bin ./sgx/ ## RUN chmod +x ./sgx/sgx_linux_x64_sdk_${SGX_VERSION}.bin