Skip to content

Commit f3b4294

Browse files
bart0shbart0sh
authored
Merge pull request #1302 from mythi/PR-2023-003
minor version upgrades
2 parents 974c8e4 + e90b1ce commit f3b4294

File tree

8 files changed

+29
-22
lines changed

8 files changed

+29
-22
lines changed

‎build/docker/intel-dlb-initcontainer.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ FROM ${GOLANG_BASE} as builder
3939
ARG DIR=/intel-device-plugins-for-kubernetes
4040
WORKDIR $DIR
4141
COPY . .
42-
ARG TOYBOX_VERSION="0.8.8"
43-
ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898"
42+
ARG TOYBOX_VERSION="0.8.9"
43+
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
4444
ARG ROOT=/install_root
4545
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
4646
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -49,7 +49,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
4949
&& tar -xzf toybox.tar.gz \
5050
&& rm toybox.tar.gz \
5151
&& cd toybox-$TOYBOX_VERSION \
52-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
52+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
5353
&& install -D LICENSE $ROOT/licenses/toybox \
5454
&& cp -r /usr/share/doc/musl $ROOT/licenses/
5555
###

‎build/docker/intel-fpga-initcontainer.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ RUN echo "{\n\
7070
\"stage\" : [ \"prestart\" ],\n\
7171
\"annotation\": [ \"fpga.intel.com/region\" ]\n\
7272
}\n">>/install_root/$SRC_DIR/$CRI_HOOK.json
73-
ARG TOYBOX_VERSION="0.8.8"
74-
ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898"
73+
ARG TOYBOX_VERSION="0.8.9"
74+
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
7575
ARG ROOT=/install_root
7676
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
7777
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -80,7 +80,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
8080
&& tar -xzf toybox.tar.gz \
8181
&& rm toybox.tar.gz \
8282
&& cd toybox-$TOYBOX_VERSION \
83-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
83+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
8484
&& install -D LICENSE $ROOT/licenses/toybox \
8585
&& cp -r /usr/share/doc/musl $ROOT/licenses/
8686
###

‎build/docker/intel-gpu-initcontainer.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5353
--save_path /install_root/licenses/$CMD/go-licenses ; \
5454
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5555
###
56-
ARG TOYBOX_VERSION="0.8.8"
57-
ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898"
56+
ARG TOYBOX_VERSION="0.8.9"
57+
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
5858
ARG ROOT=/install_root
5959
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
6060
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -63,7 +63,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
6363
&& tar -xzf toybox.tar.gz \
6464
&& rm toybox.tar.gz \
6565
&& cd toybox-$TOYBOX_VERSION \
66-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
66+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
6767
&& install -D LICENSE $ROOT/licenses/toybox \
6868
&& cp -r /usr/share/doc/musl $ROOT/licenses/
6969
###

‎build/docker/intel-qat-initcontainer.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ FROM ${GOLANG_BASE} as builder
3939
ARG DIR=/intel-device-plugins-for-kubernetes
4040
WORKDIR $DIR
4141
COPY . .
42-
ARG TOYBOX_VERSION="0.8.8"
43-
ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898"
42+
ARG TOYBOX_VERSION="0.8.9"
43+
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
4444
ARG ROOT=/install_root
4545
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
4646
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -49,7 +49,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
4949
&& tar -xzf toybox.tar.gz \
5050
&& rm toybox.tar.gz \
5151
&& cd toybox-$TOYBOX_VERSION \
52-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
52+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
5353
&& install -D LICENSE $ROOT/licenses/toybox \
5454
&& cp -r /usr/share/doc/musl $ROOT/licenses/
5555
###

‎build/docker/intel-sgx-initcontainer.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5353
--save_path /install_root/licenses/$CMD/go-licenses ; \
5454
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5555
###
56-
ARG TOYBOX_VERSION="0.8.8"
57-
ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898"
56+
ARG TOYBOX_VERSION="0.8.9"
57+
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
5858
ARG ROOT=/install_root
5959
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
6060
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -63,7 +63,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
6363
&& tar -xzf toybox.tar.gz \
6464
&& rm toybox.tar.gz \
6565
&& cd toybox-$TOYBOX_VERSION \
66-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \
66+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \
6767
&& install -D LICENSE $ROOT/licenses/toybox \
6868
&& cp -r /usr/share/doc/musl $ROOT/licenses/
6969
###

‎build/docker/lib/toybox_build.docker‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG TOYBOX_VERSION="0.8.8"
2-
ARG TOYBOX_SHA256="2bed6bb9edd5a249023103cf0402a835b0e53d10304a263f6f1e77a8aa49a898"
1+
ARG TOYBOX_VERSION="0.8.9"
2+
ARG TOYBOX_SHA256="8f2782073c1c862a405315b6516d8410e47139fc2c94b98bb5d23804537c1b65"
33

44
ARG ROOT=/install_root
55

@@ -10,7 +10,7 @@ RUN curl -SL https://github.com/landley/toybox/archive/refs/tags/$TOYBOX_VERSION
1010
&& tar -xzf toybox.tar.gz \N
1111
&& rm toybox.tar.gz \N
1212
&& cd toybox-$TOYBOX_VERSION \N
13-
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT V=2 make toybox install \N
13+
&& KCONFIG_CONFIG=${DIR}/build/docker/toybox-config LDFLAGS="--static" CC=musl-gcc PREFIX=$ROOT make toybox install \N
1414
&& install -D LICENSE $ROOT/licenses/toybox \N
1515
&& cp -r /usr/share/doc/musl $ROOT/licenses/
1616
###

‎build/docker/toybox-config‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# ToyBox version: KCONFIG_VERSION
4-
# Thu Nov 17 14:23:21 2022
4+
# Thu Jan 12 14:29:15 2023
55
#
66
# CONFIG_TOYBOX_ON_ANDROID is not set
77
CONFIG_TOYBOX_FORK=y
@@ -123,6 +123,12 @@ CONFIG_TEST_GLUE=y
123123
# CONFIG_GETFATTR is not set
124124
# CONFIG_GETOPT is not set
125125
# CONFIG_GETTY is not set
126+
# CONFIG_GITCOMPAT is not set
127+
# CONFIG_GITCLONE is not set
128+
# CONFIG_GITINIT is not set
129+
# CONFIG_GITREMOTE is not set
130+
# CONFIG_GITFETCH is not set
131+
# CONFIG_GITCHECKOUT is not set
126132
# CONFIG_GROUPADD is not set
127133
# CONFIG_GROUPDEL is not set
128134
# CONFIG_HEXDUMP is not set
@@ -238,6 +244,7 @@ CONFIG_LSPCI=y
238244
# CONFIG_MODINFO is not set
239245
# CONFIG_MOUNTPOINT is not set
240246
# CONFIG_NBD_CLIENT is not set
247+
# CONFIG_NBD_SERVER is not set
241248
# CONFIG_UNSHARE is not set
242249
# CONFIG_NSENTER is not set
243250
# CONFIG_ONEIT is not set

‎demo/openssl-qat-engine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:22.04 as builder
22

33
ARG QATLIB_VERSION="22.07.2"
4-
ARG QAT_ENGINE_VERSION="v0.6.17"
4+
ARG QAT_ENGINE_VERSION="v0.6.18"
55
ARG ASYNC_NGINX_VERSION="v0.4.9"
66
ARG IPSEC_MB_VERSION="v1.3"
7-
ARG IPP_CRYPTO_VERSION="ippcp_2021.6"
7+
ARG IPP_CRYPTO_VERSION="ippcp_2021.7"
88

99
RUN apt update && \
1010
env DEBIAN_FRONTEND=noninteractive apt install -y \
@@ -74,7 +74,7 @@ COPY --from=builder /usr/bin/*_sample* /usr/bin/
7474
COPY --from=builder /usr/lib/libqat.so.3.0.2 /usr/lib/
7575
COPY --from=builder /usr/lib/libusdm.so.0.0.1 /usr/lib/
7676
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.4 /usr/lib/x86_64-linux-gnu/
77+
COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.5 /usr/lib/x86_64-linux-gnu/
7878
COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
7979
COPY --from=builder /var/www/ /var/www/
8080
COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/

0 commit comments

Comments
 (0)