openssl-qat-engine: update versions and use buildkit parallelism

Signed-off-by: Mikko Ylinen <[email protected]>

Author: mythi

demo/openssl-qat-engine/Dockerfile

@@ -1,10 +1,11 @@
+# syntax=docker/dockerfile:labs
 FROM ubuntu:22.04 as builder
 
-ARG QATLIB_VERSION="23.11.0"
-ARG QAT_ENGINE_VERSION="v1.4.0"
-ARG ASYNC_NGINX_VERSION="v0.5.1"
-ARG IPSEC_MB_VERSION="v1.5"
-ARG IPP_CRYPTO_VERSION="ippcp_2021.9.0"
+ARG QATLIB_VERSION="24.02.0"
+ARG QAT_ENGINE_VERSION="1.5.0"
+ARG ASYNC_NGINX_VERSION="0.5.1"
+ARG IPSEC_MB_VERSION="1.5"
+ARG IPP_CRYPTO_VERSION="ippcp_2021.11.0"
 
 RUN apt update && \
     env DEBIAN_FRONTEND=noninteractive apt install -y \
@@ -17,43 +18,47 @@ RUN apt update && \
     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
+    libtool
 
-RUN cd /qatlib && \
+ADD --checksum=sha256:ffef9a3a2bd6024b188977411944ec6267da34d40a0c6c1d42c4f59165991176 https://github.com/intel/qatlib/archive/refs/tags/${QATLIB_VERSION}.tar.gz /
+RUN tar --transform s/-${QATLIB_VERSION}// -x -f ${QATLIB_VERSION}.tar.gz && \
+    cd /qatlib && \
     ./autogen.sh && \
     ./configure \
     --prefix=/usr \
     --enable-systemd=no && \
     make -j && \
     make install samples-install
 
-RUN cd /ipp-crypto/sources/ippcp/crypto_mb && \
+ADD --checksum=sha256:3a695d4040ddb47d0f4b5444d2a6535725e3da0e4bf7118f951f66da0ef7ad82 https://github.com/intel/ipp-crypto/archive/refs/tags/${IPP_CRYPTO_VERSION}.tar.gz /
+RUN tar --transform s/-${IPP_CRYPTO_VERSION}// -x -f ${IPP_CRYPTO_VERSION}.tar.gz && \
+    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 && \
+ADD --checksum=sha256:8d3f0a561b539303d81fda82584663daea65af85e07c40b393a4e8cfe839e057 https://github.com/intel/intel-ipsec-mb/archive/refs/tags/v${IPSEC_MB_VERSION}.tar.gz /
+RUN tar --transform s/-${IPSEC_MB_VERSION}// -x -f v${IPSEC_MB_VERSION}.tar.gz && \
+    cd /intel-ipsec-mb && \
     make && make install LIB_INSTALL_DIR=/usr/lib64
 
-RUN cd /QAT_Engine && \
+ADD --checksum=sha256:6ab57615d9e08b1eb61374e767d553b6c1103bd44e6f6719d3fe9e2b413614c9 https://github.com/intel/QAT_Engine/archive/refs/tags/v${QAT_ENGINE_VERSION}.tar.gz /
+RUN tar --transform s/-${QAT_ENGINE_VERSION}// -x -f v${QAT_ENGINE_VERSION}.tar.gz && \
+    cd /QAT_Engine && \
     ./autogen.sh && \
     ./configure \
     --enable-qat_sw && \
     make && make install
 
-RUN cd /asynch_mode_nginx && \
+ADD --checksum=sha256:21ba7921deaee8f9a2ba9b10bc4c61103f277483cbafff8c0f863d9336ec4afb https://github.com/intel/asynch_mode_nginx/archive/refs/tags/v${ASYNC_NGINX_VERSION}.tar.gz /
+RUN tar --transform s/-${ASYNC_NGINX_VERSION}// -x -f v${ASYNC_NGINX_VERSION}.tar.gz && \
+    cd /asynch_mode_nginx && \
     ./configure \
     --prefix=/var/www \
     --conf-path=/usr/share/nginx/conf/nginx.conf \
@@ -71,10 +76,10 @@ RUN cd /asynch_mode_nginx && \
 FROM ubuntu:22.04
 
 COPY --from=builder /usr/bin/*_sample* /usr/bin/
-COPY --from=builder /usr/lib/libqat.so.4.1.0 /usr/lib/
+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.9 /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/