From cd61d0b94c2994006184f5fbccbf913993e2f92e Mon Sep 17 00:00:00 2001
From: Hyeongju Johannes Lee <hyeongju@intel.com>
Date: Thu, 11 Apr 2024 15:03:03 -0700
Subject: [PATCH] openssl-qat-engine: use ubuntu 24.04 and drop all custom
 builds

Signed-off-by: Hyeongju Johannes Lee <hyeongju@intel.com>
---
 demo/openssl-qat-engine/Dockerfile | 89 +-----------------------------
 1 file changed, 2 insertions(+), 87 deletions(-)

diff --git a/demo/openssl-qat-engine/Dockerfile b/demo/openssl-qat-engine/Dockerfile
index 05af13d6f..ac56b9f5c 100644
--- a/demo/openssl-qat-engine/Dockerfile
+++ b/demo/openssl-qat-engine/Dockerfile
@@ -1,89 +1,4 @@
-FROM ubuntu:22.04 as builder
-
-ARG QATLIB_VERSION="24.02.0"
-ARG QAT_ENGINE_VERSION="v1.5.0"
-ARG ASYNC_NGINX_VERSION="v0.5.1"
-ARG IPSEC_MB_VERSION="v1.5"
-ARG IPP_CRYPTO_VERSION="ippcp_2021.11.0"
+FROM ubuntu:24.04
 
 RUN apt update && \
-    env DEBIAN_FRONTEND=noninteractive apt install -y \
-    libudev-dev \
-    make \
-    gcc \
-    g++ \
-    nasm \
-    pkg-config \
-    libssl-dev \
-    zlib1g-dev \
-    wget \
-    git \
-    nasm \
-    autoconf \
-    cmake \
-    libtool && \
-    git clone --depth 1 -b $ASYNC_NGINX_VERSION https://github.com/intel/asynch_mode_nginx.git && \
-    git clone --depth 1 -b $QAT_ENGINE_VERSION https://github.com/intel/QAT_Engine && \
-    git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/ipp-crypto && \
-    git clone --depth 1 -b $IPSEC_MB_VERSION https://github.com/intel/intel-ipsec-mb && \
-    git clone --depth 1 -b $QATLIB_VERSION https://github.com/intel/qatlib
-
-RUN cd /qatlib && \
-    ./autogen.sh && \
-    ./configure \
-    --prefix=/usr \
-    --enable-systemd=no && \
-    make -j && \
-    make install samples-install
-
-RUN cd /ipp-crypto/sources/ippcp/crypto_mb && \
-    cmake . -B"../build" \
-    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl \
-    -DOPENSSL_LIBRARIES=/usr/lib64 \
-    -DOPENSSL_ROOT_DIR=/usr/bin/openssl && \
-    cd ../build && \
-    make crypto_mb && make install
-
-RUN cd /intel-ipsec-mb && \
-    make && make install LIB_INSTALL_DIR=/usr/lib64
-
-RUN cd /QAT_Engine && \
-    ./autogen.sh && \
-    ./configure \
-    --enable-qat_sw && \
-    make && make install
-
-RUN cd /asynch_mode_nginx && \
-    ./configure \
-    --prefix=/var/www \
-    --conf-path=/usr/share/nginx/conf/nginx.conf \
-    --sbin-path=/usr/bin/nginx \
-    --pid-path=/run/nginx.pid \
-    --lock-path=/run/lock/nginx.lock \
-    --modules-path=/usr/lib64/nginx \
-    --without-http_rewrite_module \
-    --with-http_ssl_module \
-    --add-dynamic-module=modules/nginx_qat_module/ \
-    --with-cc-opt="-DNGX_SECURE_MEM -I/include -Wno-error=deprecated-declarations" \
-    --with-ld-opt="-L/src" && \
-    make && make install
-
-FROM ubuntu:22.04
-
-COPY --from=builder /usr/bin/*_sample* /usr/bin/
-COPY --from=builder /usr/lib/libqat.so.4.2.0 /usr/lib/
-COPY --from=builder /usr/lib/libusdm.so.0.1.0 /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.12 /usr/lib/x86_64-linux-gnu/
-COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
-COPY --from=builder /var/www/ /var/www/
-COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/
-COPY --from=builder /usr/bin/nginx /usr/bin
-COPY --from=builder /usr/share/qat/calgary32 /usr/share/qat/
-COPY --from=builder /usr/share/nginx/conf/* /usr/share/nginx/conf/
-COPY --from=builder /qatlib/LICENSE /usr/share/package-licenses/qatlib/LICENSE
-COPY --from=builder /QAT_Engine/LICENSE /usr/share/package-licenses/QAT_Engine/LICENSE
-COPY --from=builder /ipp-crypto/LICENSE /usr/share/package-licenses/ipp-crypto/LICENSE
-COPY --from=builder /asynch_mode_nginx/LICENSE /usr/share/package-licenses/asynch_mode_nginx/LICENSE
-COPY --from=builder /intel-ipsec-mb/LICENSE /usr/share/package-licenses/intel-ipsec-mb/LICENSE
-RUN ldconfig && apt update && env DEBIAN_FRONTEND=noninteractive apt install -y openssl haproxy
+    apt install --no-install-recommends -y qatengine qatlib-examples qatzip openssl
\ No newline at end of file