Skip to content

Commit d7bbc5a

Browse files
authored
Merge pull request #1716 from mythi/PR-2024-009
images: update toybox to v0.8.11
2 parents c17f656 + f0628ca commit d7bbc5a

7 files changed

+21
-16
lines changed

build/docker/intel-dlb-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ARG DIR=/intel-device-plugins-for-kubernetes
4040
WORKDIR $DIR
4141
COPY . .
4242
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE
43-
ARG TOYBOX_VERSION="0.8.10"
44-
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
43+
ARG TOYBOX_VERSION="0.8.11"
44+
ARG TOYBOX_SHA256="83a3a88cbe1fa30f099c2f58295baef4637aaf988085aaea56e03aa29168175d"
4545
ARG ROOT=/install_root
4646
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
4747
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ RUN echo "{\n\
7373
\"stage\" : [ \"prestart\" ],\n\
7474
\"annotation\": [ \"fpga.intel.com/region\" ]\n\
7575
}\n">>/install_root/$SRC_DIR/$CRI_HOOK.json
76-
ARG TOYBOX_VERSION="0.8.10"
77-
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
76+
ARG TOYBOX_VERSION="0.8.11"
77+
ARG TOYBOX_SHA256="83a3a88cbe1fa30f099c2f58295baef4637aaf988085aaea56e03aa29168175d"
7878
ARG ROOT=/install_root
7979
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
8080
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

build/docker/intel-gpu-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5656
--save_path /install_root/licenses/$CMD/go-licenses ; \
5757
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5858
###
59-
ARG TOYBOX_VERSION="0.8.10"
60-
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
59+
ARG TOYBOX_VERSION="0.8.11"
60+
ARG TOYBOX_SHA256="83a3a88cbe1fa30f099c2f58295baef4637aaf988085aaea56e03aa29168175d"
6161
ARG ROOT=/install_root
6262
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
6363
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

build/docker/intel-qat-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ARG DIR=/intel-device-plugins-for-kubernetes
4040
WORKDIR $DIR
4141
COPY . .
4242
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE
43-
ARG TOYBOX_VERSION="0.8.10"
44-
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
43+
ARG TOYBOX_VERSION="0.8.11"
44+
ARG TOYBOX_SHA256="83a3a88cbe1fa30f099c2f58295baef4637aaf988085aaea56e03aa29168175d"
4545
ARG ROOT=/install_root
4646
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
4747
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

build/docker/intel-sgx-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-ku
5656
--save_path /install_root/licenses/$CMD/go-licenses ; \
5757
else mkdir -p /install_root/licenses/$CMD/go-licenses/ && cd licenses/$CMD && cp -r * /install_root/licenses/$CMD/go-licenses/ ; fi
5858
###
59-
ARG TOYBOX_VERSION="0.8.10"
60-
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
59+
ARG TOYBOX_VERSION="0.8.11"
60+
ARG TOYBOX_SHA256="83a3a88cbe1fa30f099c2f58295baef4637aaf988085aaea56e03aa29168175d"
6161
ARG ROOT=/install_root
6262
RUN apt-get update && apt-get --no-install-recommends -y install musl musl-tools musl-dev
6363
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

build/docker/lib/toybox_build.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG TOYBOX_VERSION="0.8.10"
2-
ARG TOYBOX_SHA256="3c31e235fe87e74e6c6cf7cd7299fcbffb0f4a4834dae607aa26bb4f1583549a"
1+
ARG TOYBOX_VERSION="0.8.11"
2+
ARG TOYBOX_SHA256="83a3a88cbe1fa30f099c2f58295baef4637aaf988085aaea56e03aa29168175d"
33

44
ARG ROOT=/install_root
55

build/docker/toybox-config-static

Lines changed: 9 additions & 4 deletions
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 Dec 7 19:38:32 2023
4+
# Tue Apr 23 18:03:07 2024
55
#
66
# CONFIG_TOYBOX_ON_ANDROID is not set
77
CONFIG_TOYBOX_FORK=y
@@ -35,6 +35,7 @@ CONFIG_ENV=y
3535
# CONFIG_FALSE is not set
3636
# CONFIG_FILE is not set
3737
# CONFIG_FIND is not set
38+
# CONFIG_FOLD is not set
3839
# CONFIG_GETCONF is not set
3940
CONFIG_GREP=y
4041
CONFIG_EGREP=y
@@ -86,10 +87,10 @@ CONFIG_TEST_GLUE=y
8687
# CONFIG_TIME is not set
8788
# CONFIG_TOUCH is not set
8889
# CONFIG_TRUE is not set
90+
# CONFIG_TSORT is not set
8991
# CONFIG_TTY is not set
9092
# CONFIG_ULIMIT is not set
9193
# CONFIG_ARCH is not set
92-
# CONFIG_LINUX32 is not set
9394
# CONFIG_UNAME is not set
9495
# CONFIG_UNIQ is not set
9596
# CONFIG_UNLINK is not set
@@ -110,6 +111,7 @@ CONFIG_TEST_GLUE=y
110111
# CONFIG_CHSH is not set
111112
# CONFIG_CROND is not set
112113
# CONFIG_CRONTAB is not set
114+
# CONFIG_CSPLIT is not set
113115
# CONFIG_DHCP is not set
114116
# CONFIG_DHCP6 is not set
115117
# CONFIG_DHCPD is not set
@@ -118,10 +120,8 @@ CONFIG_TEST_GLUE=y
118120
# CONFIG_DUMPLEASES is not set
119121
# CONFIG_EXPR is not set
120122
# CONFIG_FDISK is not set
121-
# CONFIG_FOLD is not set
122123
# CONFIG_FSCK is not set
123124
# CONFIG_GETFATTR is not set
124-
# CONFIG_GETOPT is not set
125125
# CONFIG_GETTY is not set
126126
# CONFIG_GITCOMPAT is not set
127127
# CONFIG_GITCLONE is not set
@@ -213,6 +213,7 @@ CONFIG_SH=y
213213
# CONFIG_FREERAMDISK is not set
214214
# CONFIG_FSFREEZE is not set
215215
# CONFIG_FSYNC is not set
216+
# CONFIG_GETOPT is not set
216217
# CONFIG_GPIODETECT is not set
217218
# CONFIG_GPIOFIND is not set
218219
# CONFIG_GPIOINFO is not set
@@ -230,6 +231,7 @@ CONFIG_SH=y
230231
# CONFIG_INSMOD is not set
231232
# CONFIG_IONICE is not set
232233
# CONFIG_IORENICE is not set
234+
# CONFIG_LINUX32 is not set
233235
# CONFIG_LOGIN is not set
234236
# CONFIG_LOSETUP is not set
235237
# CONFIG_LSATTR is not set
@@ -239,6 +241,7 @@ CONFIG_LSPCI=y
239241
# CONFIG_LSUSB is not set
240242
# CONFIG_MAKEDEVS is not set
241243
# CONFIG_MCOOKIE is not set
244+
# CONFIG_MEMEATER is not set
242245
# CONFIG_MIX is not set
243246
# CONFIG_MKPASSWD is not set
244247
# CONFIG_MKSWAP is not set
@@ -282,6 +285,7 @@ CONFIG_REALPATH=y
282285
# CONFIG_TASKSET is not set
283286
# CONFIG_TIMEOUT is not set
284287
# CONFIG_TRUNCATE is not set
288+
# CONFIG_TS is not set
285289
# CONFIG_UCLAMPSET is not set
286290
# CONFIG_UPTIME is not set
287291
# CONFIG_USLEEP is not set
@@ -382,6 +386,7 @@ CONFIG_TOYBOX_LSM_NONE=y
382386
# CONFIG_TOYBOX_FLOAT is not set
383387
# CONFIG_TOYBOX_HELP is not set
384388
# CONFIG_TOYBOX_HELP_DASHDASH is not set
389+
# CONFIG_TOYBOX_ZHELP is not set
385390
# CONFIG_TOYBOX_FREE is not set
386391
# CONFIG_TOYBOX_NORECURSE is not set
387392
# CONFIG_TOYBOX_DEBUG is not set

0 commit comments

Comments
 (0)