From 77e2ed78311e09703528ffd61b37676202cd3108 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 20 Nov 2025 08:57:25 +0200 Subject: [PATCH] demo: sgx: fix DCAP download checksum and bump versions DCAP repository was renamed and this changes the download checksum. The result is that the image build fails and blocks CI. Update the DCAP repository url, download checksum, and the release version. Also, move the base image(s) from jammy to noble. Signed-off-by: Mikko Ylinen --- demo/sgx-aesmd-demo/Dockerfile | 6 +++--- demo/sgx-sdk-demo/Dockerfile | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/demo/sgx-aesmd-demo/Dockerfile b/demo/sgx-aesmd-demo/Dockerfile index 78b9f7a7c..8fe984053 100644 --- a/demo/sgx-aesmd-demo/Dockerfile +++ b/demo/sgx-aesmd-demo/Dockerfile @@ -1,9 +1,9 @@ # This Dockerfile is currently provided as a reference to build aesmd with ECDSA attestation # but is not published along with the device plugin container images. -FROM ubuntu:22.04 +FROM ubuntu:24.04 -RUN apt update && apt install -y curl gnupg-agent \ - && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" | \ +RUN apt update && apt install -y curl gpg \ + && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu noble main" | \ tee -a /etc/apt/sources.list.d/intel-sgx.list \ && curl -s https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | \ gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg \ diff --git a/demo/sgx-sdk-demo/Dockerfile b/demo/sgx-sdk-demo/Dockerfile index 66d6684ac..3a798cc6e 100644 --- a/demo/sgx-sdk-demo/Dockerfile +++ b/demo/sgx-sdk-demo/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 AS builder +FROM ubuntu:24.04 AS builder WORKDIR /root @@ -23,9 +23,9 @@ RUN apt-get update && \ # SGX SDK is installed in /opt/intel directory. WORKDIR /opt/intel -ARG DCAP_VERSION=DCAP_1.21 +ARG DCAP_VERSION=DCAP_1.23 -RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" | \ +RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu noble 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 \ @@ -37,7 +37,7 @@ RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://d libsgx-quote-ex-dev # Install SGX SDK -ARG SGX_SDK_URL=https://download.01.org/intel-sgx/sgx-linux/2.24/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.24.100.3.bin +ARG SGX_SDK_URL=https://download.01.org/intel-sgx/sgx-linux/2.26/distro/ubuntu24.04-server/sgx_linux_x64_sdk_2.26.100.0.bin RUN wget ${SGX_SDK_URL} \ && export SGX_SDK_INSTALLER=$(basename $SGX_SDK_URL) \ && chmod +x $SGX_SDK_INSTALLER \ @@ -49,11 +49,11 @@ RUN cd sgxsdk/SampleCode/SampleEnclave \ && make \ && cd - -ARG DCAP_TARBALL_SHA256="f0336fef8263b4c53664efb8486c021ca3d996817eb63b0671324a0acf706310" +ARG DCAP_TARBALL_SHA256="9284ac7223f72daaeed8fb3c5bb3e4b1ccee6c2deafd0e7398c95c9fa50ffe8a" -RUN wget -q https://github.com/intel/SGXDataCenterAttestationPrimitives/archive/$DCAP_VERSION.tar.gz && \ +RUN wget -q https://github.com/intel/confidential-computing.tee.dcap/archive/$DCAP_VERSION.tar.gz && \ echo "$DCAP_TARBALL_SHA256 $DCAP_VERSION.tar.gz" | sha256sum -c - && \ - tar xzf $DCAP_VERSION.tar.gz && mv SGXDataCenterAttestationPrimitives* SGXDataCenterAttestationPrimitives + tar xzf $DCAP_VERSION.tar.gz && mv confidential-computing.tee.dcap* SGXDataCenterAttestationPrimitives RUN cd SGXDataCenterAttestationPrimitives/SampleCode/QuoteGenerationSample \ && . /opt/intel/sgxsdk/environment \ @@ -66,15 +66,15 @@ RUN cd SGXDataCenterAttestationPrimitives/SampleCode/QuoteVerificationSample \ && sgx_sign sign -key ../QuoteGenerationSample/Enclave/Enclave_private_sample.pem -enclave enclave.so -out enclave.signed.so -config Enclave/Enclave.config.xml \ && cd - -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update && \ apt-get install -y \ wget \ - gnupg-agent + gnupg # Add 01.org to apt for SGX packages and install SGX runtime components -RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" | \ +RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu noble 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 \ @@ -102,4 +102,4 @@ COPY --from=builder /opt/intel/SGXDataCenterAttestationPrimitives/SampleCode/Quo COPY --chmod=555 run-dcap-flow /opt/intel -ENTRYPOINT /opt/intel/sgx-sample-app/sgx-sample-app +ENTRYPOINT ["/opt/intel/sgx-sample-app/sgx-sample-app"]