Merge pull request #1259 from mythi/PR-2022-081

demo image updates to Ubuntu 22.04

Author: bart0sh

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

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 \

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/

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 \

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,15 +55,15 @@ RUN cd SGXDataCenterAttestationPrimitives/SampleCode/QuoteGenerationSample \
     && make \
     && cd -
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install -y \
     wget \
     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 \