Merge pull request #1193 from mythi/PR-2022-071

demo: Dockerfile version updates

Author: bart0sh

.github/workflows/ci.yaml

@@ -131,7 +131,6 @@ jobs:
           - openssl-qat-engine
           - sgx-sdk-demo
           - sgx-aesmd-demo
-          - ubuntu-demo-openvino
           - dlb-dpdk-demo
           - dlb-libdlb-demo
         builder: [buildah, docker]

Makefile

@@ -240,10 +240,11 @@ null  :=
 space := $(null) #
 comma := ,
 images_json := $(subst $(space),$(comma),[$(addprefix ",$(addsuffix ",$(images) $(demos))]))
+skip_images := "ubuntu-demo-openvino"
 
 check-github-actions:
 	@python3 -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin, Loader=yaml.SafeLoader), sys.stdout)' < .github/workflows/ci.yaml | \
-	jq -e '$(images_json) - .jobs.image.strategy.matrix.image == []' > /dev/null || \
+	jq -e '$(images_json) - [$(skip_images)] - .jobs.image.strategy.matrix.image == []' > /dev/null || \
 	(echo "Make sure all images are listed in .github/workflows/ci.yaml"; exit 1)
 
 .PHONY: all format test lint build images $(cmds) $(images) lock-images vendor pre-pull set-version check-github-actions envtest fixture update-fixture install-tools test-image-base-layer

demo/openssl-qat-engine/Dockerfile

@@ -1,9 +1,9 @@
 FROM ubuntu:22.04 as builder
 
 ARG QATLIB_VERSION="22.07.0"
-ARG QAT_ENGINE_VERSION="v0.6.15"
+ARG QAT_ENGINE_VERSION="v0.6.16"
 ARG ASYNC_NGINX_VERSION="v0.4.7"
-ARG IPSEC_MB_VERSION="v1.2"
+ARG IPSEC_MB_VERSION="v1.3"
 ARG IPP_CRYPTO_VERSION="ippcp_2021.6"
 
 RUN apt update && \

demo/sgx-sdk-demo/Dockerfile

@@ -23,19 +23,21 @@ RUN apt-get update && \
 # SGX SDK is installed in /opt/intel directory.
 WORKDIR /opt/intel
 
-ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.16.100.4.bin
-ARG DCAP_VERSION=DCAP_1.13
+ARG SGX_SDK_INSTALLER=sgx_linux_x64_sdk_2.17.101.1.bin
+ARG DCAP_VERSION=DCAP_1.14
 
-RUN echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" >> /etc/apt/sources.list.d/intel-sgx.list \
- && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - \
+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 \
+ && wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | \
+    gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg \
  && apt-get update \
  && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
     libsgx-dcap-ql-dev \
     libsgx-dcap-default-qpl-dev \
     libsgx-quote-ex-dev
 
 # Install SGX SDK
-RUN wget https://download.01.org/intel-sgx/sgx-linux/2.16/distro/ubuntu20.04-server/$SGX_SDK_INSTALLER \
+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 \
  && echo "yes" | ./$SGX_SDK_INSTALLER \
  && rm $SGX_SDK_INSTALLER