Skip to content

Commit 18d6e2d

Browse files
mythimythi
authored
Merge pull request #1728 from tkatila/random-fixes
2 parents 7daa87a + e8fbee6 commit 18d6e2d

File tree

6 files changed

+11
-96
lines changed

6 files changed

+11
-96
lines changed

‎.github/workflows/lib-publish.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- intel-xpumanager-sidecar
4040

4141
# # Demo images
42-
- crypto-perf
43-
- opae-nlb-demo
42+
#- crypto-perf
43+
#- opae-nlb-demo
4444
steps:
4545
- uses: actions/checkout@v4
4646
- uses: actions/setup-go@v5

‎demo/accel-config-demo/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN cd / && git clone --recurse-submodules --depth 1 --branch v1.5.0 https://git
3131

3232
FROM debian:unstable-slim
3333

34-
RUN apt-get update && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test && rm -rf /var/lib/apt/lists/\*
34+
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends pciutils accel-config accel-config-test kmod && rm -rf /var/lib/apt/lists/\*
3535

3636
RUN sed -i -e '420,429d;480,489d' /usr/libexec/accel-config/test/iaa_user_test_runner.sh
3737
COPY --from=builder /usr/local /usr/local

‎demo/crypto-perf/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:sid-slim as builder
1+
FROM debian:unstable-slim as builder
22

33
ARG DIR=/dpdk-build
44
WORKDIR $DIR
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget build-esse
1111
ARG DPDK_TARBALL=dpdk-24.03.tar.xz
1212
ARG DPDK_TARBALL_SHA256="33ed973b3945af4f5923096ddca250b401dc80be3b5c6393b4e4fe43a1a6c2ad"
1313

14-
RUN wget -q https://git.dpdk.org/dpdk/snapshot/$DPDK_TARBALL \
14+
RUN wget -q https://fast.dpdk.org/rel/$DPDK_TARBALL \
1515
&& echo "$DPDK_TARBALL_SHA256 $DPDK_TARBALL" | sha256sum -c - \
1616
&& tar -xf $DPDK_TARBALL && rm $DPDK_TARBALL
1717

@@ -37,8 +37,8 @@ RUN mkdir -p /install_root/licenses/dpdk && \
3737
cd /install_root/licenses/dpdk && \
3838
apt-get source --download-only -y libatomic1 libnuma1
3939

40-
FROM debian:sid-slim
41-
RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
40+
FROM debian:unstable-slim
41+
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
4242
COPY --from=builder /install_root /
4343
COPY run-dpdk-test /usr/bin/
4444

‎demo/intel-opencl-icd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
33
ARG APT="env DEBIAN_FRONTEND=noninteractive apt"
44

55
RUN ${APT} update && ${APT} install -y curl gpg-agent \
6-
&& echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy flex' | \
6+
&& echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy/lts/2350 unified' | \
77
tee -a /etc/apt/sources.list.d/intel.list \
88
&& curl -s https://repositories.intel.com/graphics/intel-graphics.key | \
99
gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg \

‎demo/opae-nlb-demo/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \
2626

2727
FROM debian:unstable-slim
2828

29-
RUN apt-get update && apt-get install --no-install-recommends -y libjson-c5
29+
RUN apt-get update && apt-get upgrade -y && apt-get install --no-install-recommends -y libjson-c5
3030

3131
# Copy required nlb* utils and their dependencies to the final image
3232
COPY --from=builder /usr/src/opae/opae-sdk-*/build/bin/nlb* /usr/local/bin/

‎demo/openssl-qat-engine/Dockerfile

+2-87
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,4 @@
1-
FROM ubuntu:22.04 as builder
2-
3-
ARG QATLIB_VERSION="24.02.0"
4-
ARG QAT_ENGINE_VERSION="v1.5.0"
5-
ARG ASYNC_NGINX_VERSION="v0.5.1"
6-
ARG IPSEC_MB_VERSION="v1.5"
7-
ARG IPP_CRYPTO_VERSION="ippcp_2021.11.0"
1+
FROM ubuntu:24.04
82

93
RUN apt update && \
10-
env DEBIAN_FRONTEND=noninteractive apt install -y \
11-
libudev-dev \
12-
make \
13-
gcc \
14-
g++ \
15-
nasm \
16-
pkg-config \
17-
libssl-dev \
18-
zlib1g-dev \
19-
wget \
20-
git \
21-
nasm \
22-
autoconf \
23-
cmake \
24-
libtool && \
25-
git clone --depth 1 -b $ASYNC_NGINX_VERSION https://github.com/intel/asynch_mode_nginx.git && \
26-
git clone --depth 1 -b $QAT_ENGINE_VERSION https://github.com/intel/QAT_Engine && \
27-
git clone --depth 1 -b $IPP_CRYPTO_VERSION https://github.com/intel/ipp-crypto && \
28-
git clone --depth 1 -b $IPSEC_MB_VERSION https://github.com/intel/intel-ipsec-mb && \
29-
git clone --depth 1 -b $QATLIB_VERSION https://github.com/intel/qatlib
30-
31-
RUN cd /qatlib && \
32-
./autogen.sh && \
33-
./configure \
34-
--prefix=/usr \
35-
--enable-systemd=no && \
36-
make -j && \
37-
make install samples-install
38-
39-
RUN cd /ipp-crypto/sources/ippcp/crypto_mb && \
40-
cmake . -B"../build" \
41-
-DOPENSSL_INCLUDE_DIR=/usr/include/openssl \
42-
-DOPENSSL_LIBRARIES=/usr/lib64 \
43-
-DOPENSSL_ROOT_DIR=/usr/bin/openssl && \
44-
cd ../build && \
45-
make crypto_mb && make install
46-
47-
RUN cd /intel-ipsec-mb && \
48-
make && make install LIB_INSTALL_DIR=/usr/lib64
49-
50-
RUN cd /QAT_Engine && \
51-
./autogen.sh && \
52-
./configure \
53-
--enable-qat_sw && \
54-
make && make install
55-
56-
RUN cd /asynch_mode_nginx && \
57-
./configure \
58-
--prefix=/var/www \
59-
--conf-path=/usr/share/nginx/conf/nginx.conf \
60-
--sbin-path=/usr/bin/nginx \
61-
--pid-path=/run/nginx.pid \
62-
--lock-path=/run/lock/nginx.lock \
63-
--modules-path=/usr/lib64/nginx \
64-
--without-http_rewrite_module \
65-
--with-http_ssl_module \
66-
--add-dynamic-module=modules/nginx_qat_module/ \
67-
--with-cc-opt="-DNGX_SECURE_MEM -I/include -Wno-error=deprecated-declarations" \
68-
--with-ld-opt="-L/src" && \
69-
make && make install
70-
71-
FROM ubuntu:22.04
72-
73-
COPY --from=builder /usr/bin/*_sample* /usr/bin/
74-
COPY --from=builder /usr/lib/libqat.so.4.2.0 /usr/lib/
75-
COPY --from=builder /usr/lib/libusdm.so.0.1.0 /usr/lib/
76-
COPY --from=builder /usr/lib64/libIPSec_MB.so.1 /usr/lib/x86_64-linux-gnu/
77-
COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.12 /usr/lib/x86_64-linux-gnu/
78-
COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
79-
COPY --from=builder /var/www/ /var/www/
80-
COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/
81-
COPY --from=builder /usr/bin/nginx /usr/bin
82-
COPY --from=builder /usr/share/qat/calgary32 /usr/share/qat/
83-
COPY --from=builder /usr/share/nginx/conf/* /usr/share/nginx/conf/
84-
COPY --from=builder /qatlib/LICENSE /usr/share/package-licenses/qatlib/LICENSE
85-
COPY --from=builder /QAT_Engine/LICENSE /usr/share/package-licenses/QAT_Engine/LICENSE
86-
COPY --from=builder /ipp-crypto/LICENSE /usr/share/package-licenses/ipp-crypto/LICENSE
87-
COPY --from=builder /asynch_mode_nginx/LICENSE /usr/share/package-licenses/asynch_mode_nginx/LICENSE
88-
COPY --from=builder /intel-ipsec-mb/LICENSE /usr/share/package-licenses/intel-ipsec-mb/LICENSE
89-
RUN ldconfig && apt update && env DEBIAN_FRONTEND=noninteractive apt install -y openssl haproxy
4+
apt install --no-install-recommends -y qatengine qatlib-examples qatzip openssl

0 commit comments

Comments
 (0)