From 2753ba0c2596be4d881f119eec85433a9f752efd Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 28 Nov 2022 14:00:40 +0200 Subject: [PATCH 1/4] demo: update openssl-qat-engine versions Signed-off-by: Mikko Ylinen --- demo/openssl-qat-engine/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/openssl-qat-engine/Dockerfile b/demo/openssl-qat-engine/Dockerfile index f38acb442..67d7e025a 100644 --- a/demo/openssl-qat-engine/Dockerfile +++ b/demo/openssl-qat-engine/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:22.04 as builder -ARG QATLIB_VERSION="22.07.0" -ARG QAT_ENGINE_VERSION="v0.6.16" -ARG ASYNC_NGINX_VERSION="v0.4.7" +ARG QATLIB_VERSION="22.07.2" +ARG QAT_ENGINE_VERSION="v0.6.17" +ARG ASYNC_NGINX_VERSION="v0.4.9" ARG IPSEC_MB_VERSION="v1.3" ARG IPP_CRYPTO_VERSION="ippcp_2021.6" @@ -18,7 +18,7 @@ RUN apt update && \ zlib1g-dev \ wget \ git \ - yasm \ + nasm \ autoconf \ cmake \ libtool && \ @@ -71,7 +71,7 @@ RUN cd /asynch_mode_nginx && \ FROM ubuntu:22.04 COPY --from=builder /usr/bin/*_sample* /usr/bin/ -COPY --from=builder /usr/lib/libqat.so.3.0.0 /usr/lib/ +COPY --from=builder /usr/lib/libqat.so.3.0.2 /usr/lib/ COPY --from=builder /usr/lib/libusdm.so.0.0.1 /usr/lib/ COPY --from=builder /usr/lib64/libIPSec_MB.so.1 /usr/lib/x86_64-linux-gnu/ COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.4 /usr/lib/x86_64-linux-gnu/ From bffe72cd3afaeef95e2e3cf97bb7519e98642e78 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 28 Nov 2022 14:11:17 +0200 Subject: [PATCH 2/4] demo: move SGX images to Ubuntu 22.04 Signed-off-by: Mikko Ylinen --- demo/sgx-aesmd-demo/Dockerfile | 4 ++-- demo/sgx-sdk-demo/Dockerfile | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/demo/sgx-aesmd-demo/Dockerfile b/demo/sgx-aesmd-demo/Dockerfile index 0416172b2..78b9f7a7c 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:20.04 +FROM ubuntu:22.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 focal main" | \ + && 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 \ && 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 8e5ac95f7..89f5c75be 100644 --- a/demo/sgx-sdk-demo/Dockerfile +++ b/demo/sgx-sdk-demo/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS builder +FROM ubuntu:22.04 AS builder WORKDIR /root @@ -23,10 +23,9 @@ RUN apt-get update && \ # SGX SDK is installed in /opt/intel directory. WORKDIR /opt/intel -ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.17.101.1.bin -ARG DCAP_VERSION=DCAP_1.14 +ARG DCAP_VERSION=DCAP_1.15 -RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" | \ +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 \ @@ -37,8 +36,10 @@ RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://d libsgx-quote-ex-dev # Install SGX SDK -RUN wget https://download.01.org/intel-sgx/sgx-linux/2.17.1/distro/ubuntu20.04-server/$SGX_SDK_INSTALLER \ - && chmod +x $SGX_SDK_INSTALLER \ +ARG SGX_SDK_URL=https://download.01.org/intel-sgx/sgx-linux/2.18/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.18.100.3.bin +RUN wget ${SGX_SDK_URL} \ + && export SGX_SDK_INSTALLER=$(basename $SGX_SDK_URL) \ + && chmod +x $SGX_SDK_INSTALLER \ && echo "yes" | ./$SGX_SDK_INSTALLER \ && rm $SGX_SDK_INSTALLER @@ -54,7 +55,7 @@ RUN cd SGXDataCenterAttestationPrimitives/SampleCode/QuoteGenerationSample \ && make \ && cd - -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN apt-get update && \ apt-get install -y \ @@ -62,7 +63,7 @@ RUN apt-get update && \ gnupg-agent # 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 focal main" | \ +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 \ From c4daeebd7320a6490ce7d6ed1cded1b0f5f285ec Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 28 Nov 2022 14:11:49 +0200 Subject: [PATCH 3/4] demo: move opencl-icd image to Ubuntu 22.04 Signed-off-by: Mikko Ylinen --- demo/intel-opencl-icd/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/intel-opencl-icd/Dockerfile b/demo/intel-opencl-icd/Dockerfile index 5c05bbcd6..22fb46b20 100644 --- a/demo/intel-opencl-icd/Dockerfile +++ b/demo/intel-opencl-icd/Dockerfile @@ -1,9 +1,9 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG APT="env DEBIAN_FRONTEND=noninteractive apt" RUN ${APT} update && ${APT} install -y curl gpg-agent \ - && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu focal main' | \ + && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy main' | \ tee -a /etc/apt/sources.list.d/intel.list \ && curl -s https://repositories.intel.com/graphics/intel-graphics.key | \ gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg \ From 4eb8190ba7a406c71ec085f9df3a79501b7f5628 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 28 Nov 2022 14:12:18 +0200 Subject: [PATCH 4/4] make: pre-pull Ubuntu 22.04 Signed-off-by: Mikko Ylinen --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 22831b7a2..23de9f4ff 100644 --- a/Makefile +++ b/Makefile @@ -176,8 +176,7 @@ pre-pull: ifeq ($(TAG),devel) @$(BUILDER) pull golang:1.19-bullseye @$(BUILDER) pull debian:unstable-slim - @$(BUILDER) pull clearlinux:latest - @$(BUILDER) pull ubuntu:20.04 + @$(BUILDER) pull ubuntu:22.04 endif dockerlib = build/docker/lib