Skip to content

Commit ceb9d4a

Browse files
krithikxYogaraj-Alamenda
authored andcommitted
Version bump for Dockerfile
Signed-off-by: Krithika Kumaravelu <krithikax.kumaravelu@intel.com>
1 parent be20be7 commit ceb9d4a

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

dockerfiles/haproxy/Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
ARG UBUNTU_BASE=ubuntu:22.04
3939
FROM ${UBUNTU_BASE} AS builder
4040

41-
ARG OPENSSL_VERSION="openssl-3.0.14"
41+
ARG OPENSSL_VERSION="openssl-3.0.15"
4242
ARG QATLIB_VERSION="24.02.0"
43-
ARG QAT_ENGINE_VERSION="v1.6.1"
43+
ARG QAT_ENGINE_VERSION="v1.7.0"
4444
ARG IPSEC_MB_VERSION="v1.5"
4545
ARG IPP_CRYPTO_VERSION="ippcp_2021.12.1"
4646
ARG HAPROXY_VERSION="v2.8.0"
@@ -49,11 +49,11 @@ ENV DEBIAN_FRONTEND=noninteractive
4949

5050
# Install required packages including curl, telnet, and git
5151
RUN apt-get update && \
52-
apt-get install -y apt-utils --no-install-recommends
52+
apt-get install -y apt-utils
5353

5454
# Upgrade all other packages
5555
RUN apt-get upgrade -y && \
56-
apt-get install -y --no-install-recommends \
56+
apt-get install -y \
5757
libudev-dev \
5858
make \
5959
gcc \
@@ -75,7 +75,7 @@ RUN apt-get upgrade -y && \
7575
libtool && \
7676
git clone --depth 1 -b $OPENSSL_VERSION https://github.com/openssl/openssl.git && \
7777
git clone --depth 1 -b $QAT_ENGINE_VERSION https://github.com/intel/QAT_Engine && \
78-
git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/ipp-crypto && \
78+
git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/cryptography-primitives && \
7979
git clone --depth 1 -b $IPSEC_MB_VERSION https://github.com/intel/intel-ipsec-mb && \
8080
git clone --depth 1 -b $QATLIB_VERSION https://github.com/intel/qatlib && \
8181
git clone --depth 1 -b $HAPROXY_VERSION https://github.com/haproxy/haproxy
@@ -99,13 +99,13 @@ RUN ./autogen.sh && \
9999
usermod -a -G qat appuser
100100

101101
# Building Crypto_MB
102-
WORKDIR /ipp-crypto/sources/ippcp/crypto_mb
102+
WORKDIR /cryptography-primitives/sources/ippcp/crypto_mb
103103
RUN cmake . -B"../build" \
104104
-DOPENSSL_INCLUDE_DIR=/usr/local/include \
105105
-DOPENSSL_LIBRARIES=/usr/local/lib64 \
106106
-DOPENSSL_ROOT_DIR=/openssl
107107

108-
WORKDIR /ipp-crypto/sources/ippcp/build
108+
WORKDIR /cryptography-primitives/sources/ippcp/build
109109
RUN make crypto_mb -j && make install -j
110110

111111
# Building Ipsec_MB
@@ -148,7 +148,9 @@ COPY --from=builder /usr/local/sbin/haproxy /usr/local/sbin/haproxy
148148
COPY --from=builder /usr/local/etc/haproxy/ /usr/local/etc/haproxy/
149149
RUN ldconfig
150150

151+
#Expose the 8080 port
151152
EXPOSE 8080
153+
152154
# Switch to non-root user
153155
USER appuser
154156

dockerfiles/haproxy/haproxy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit fdd8154ed37fef7f351075caa357917f94704dd7

dockerfiles/qat_crypto_base/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# \
44
# BSD LICENSE \
55
# \
6-
# opyright(c) 2024 Intel Corporation. \
6+
# Copyright(c) 2024 Intel Corporation. \
77
# All rights reserved. \
88
# \
99
# Redistribution and use in source and binary forms, with or without \
@@ -38,21 +38,21 @@
3838
ARG UBUNTU_BASE=ubuntu:22.04
3939
FROM ${UBUNTU_BASE} AS builder
4040

41-
ARG OPENSSL_VERSION="openssl-3.0.14"
41+
ARG OPENSSL_VERSION="openssl-3.0.15"
4242
ARG QATLIB_VERSION="24.02.0"
43-
ARG QAT_ENGINE_VERSION="v1.6.1"
43+
ARG QAT_ENGINE_VERSION="v1.7.0"
4444
ARG IPSEC_MB_VERSION="v1.5"
4545
ARG IPP_CRYPTO_VERSION="ippcp_2021.12.1"
4646
ARG GID
4747
ENV DEBIAN_FRONTEND=noninteractive
4848

4949
# Install required packages including curl, telnet, and git
5050
RUN apt-get update && \
51-
apt-get install -y apt-utils --no-install-recommends
51+
apt-get install -y apt-utils
5252

5353
# Upgrade all other packages
5454
RUN apt-get upgrade -y && \
55-
apt-get install -y --no-install-recommends \
55+
apt-get install -y \
5656
libudev-dev \
5757
make \
5858
gcc \
@@ -70,7 +70,7 @@ RUN apt-get upgrade -y && \
7070
libtool && \
7171
git clone --depth 1 -b $OPENSSL_VERSION https://github.com/openssl/openssl.git && \
7272
git clone --depth 1 -b $QAT_ENGINE_VERSION https://github.com/intel/QAT_Engine && \
73-
git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/ipp-crypto && \
73+
git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/cryptography-primitives && \
7474
git clone --depth 1 -b $IPSEC_MB_VERSION https://github.com/intel/intel-ipsec-mb && \
7575
git clone --depth 1 -b $QATLIB_VERSION https://github.com/intel/qatlib
7676

@@ -93,13 +93,13 @@ RUN ./autogen.sh && \
9393
usermod -a -G qat appuser
9494

9595
# Building Cypto_MB
96-
WORKDIR /ipp-crypto/sources/ippcp/crypto_mb
96+
WORKDIR /cryptography-primitives/sources/ippcp/crypto_mb
9797
RUN cmake . -B"../build" \
9898
-DOPENSSL_INCLUDE_DIR=/usr/local/include \
9999
-DOPENSSL_LIBRARIES=/usr/local/lib64 \
100100
-DOPENSSL_ROOT_DIR=/openssl
101101

102-
WORKDIR /ipp-crypto/sources/ippcp/build
102+
WORKDIR /cryptography-primitives/sources/ippcp/build
103103
RUN make crypto_mb -j && make install -j
104104

105105
# Building Ipsec_MB
@@ -115,7 +115,7 @@ RUN ./autogen.sh && \
115115
--enable-qat_sw && \
116116
make -j && make install -j
117117

118-
#Added to remobe libc library for vulnerability issue
118+
#Added to remove libc library for vulnerability issue
119119
RUN apt-get purge -y linux-libc-dev
120120

121121
FROM ${UBUNTU_BASE}

docs/software_requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ and also from the latest versions from the links below.
1414
* [Intel® QuickAssist Technology Driver for Linux\* HW Version 2.0][4] - **QAT20.L.1.1.50-00003**
1515
* [Intel® QuickAssist Technology Driver for Linux\* HW Version 1.x][5] - **QAT.L.4.26.0-00008**
1616
* [Intel® QuickAssist Technology Driver for FreeBSD\* HW Version 1.x and 2.0] - **QAT.B.3.14.31-00003** (FreeBSD 13.2)
17-
* [Intel® QATlib for Linux with intree driver][7] - **QATlib 24.09.0**
17+
* [Intel® QATlib for Linux with intree driver][7] - **QATlib 24.09.0** & **QATlib 24.02.0** (for Dockerfile only)
1818
* [Intel® QATlib for FreeBSD with intree driver(FreeBSD 14)][8] - **FreeBSD QATlib 23.09.0** (FreeBSD 14)
1919

2020
## QAT_SW Libraries:

0 commit comments

Comments
 (0)