docker: Remove LegacyKeyValueFormat warnings in non-generated files
Manually update Dockerfiles to not use legacy 'ENV key value' format: https://docs.docker.com/reference/build-checks/legacy-key-value-format/ This removes warnings when building / using the containers: - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 98) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 64) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 97) Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Reviewed-by: Brian Cain <brian.cain@oss.qualcomm.com> Message-ID: <20260518102222.80735-7-philmd@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Philippe Mathieu-Daudé committed
May 18, 2026 at 11:50 UTC
c75f4af469ed87b240a21226f456b051e630b4f7
6 files changed
+28
-27
scripts/coverity-scan/coverity-scan.docker
+6
-6
@@ -152,12 +152,12 @@ exec "$@"' > /usr/bin/nosync && \
152
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
153
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
154
155
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
156
-ENV LANG "en_US.UTF-8"
157
-ENV MAKE "/usr/bin/make"
158
-ENV NINJA "/usr/bin/ninja"
159
-ENV PYTHON "/usr/bin/python3"
160
-ENV QEMU_CONFIGURE_OPTS --meson=internal
155
+ENV CCACHE_WRAPPERSDIR=/usr/libexec/ccache-wrappers
156
+ENV LANG=en_US.UTF-8
157
+ENV MAKE=/usr/bin/make
158
+ENV NINJA=/usr/bin/ninja
159
+ENV PYTHON=/usr/bin/python3
160
+ENV QEMU_CONFIGURE_OPTS=--meson=internal
161
162
RUN dnf install -y curl wget
163
ENV COVERITY_TOOL_BASE=/coverity-tools
tests/docker/dockerfiles/debian-hexagon-cross.docker
+7
-7
@@ -39,15 +39,15 @@ RUN apt-get update && \
39
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \
40
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
41
42
-ENV TOOLCHAIN_INSTALL /opt
43
-ENV TOOLCHAIN_RELEASE 12.Dec.2023
44
-ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl"
45
-ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz
46
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
42
+ENV TOOLCHAIN_INSTALL=/opt
43
+ENV TOOLCHAIN_RELEASE=12.Dec.2023
44
+ENV TOOLCHAIN_BASENAME=clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl
45
+ENV TOOLCHAIN_URL=https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz
46
+ENV CCACHE_WRAPPERSDIR=/usr/libexec/ccache-wrappers
47
48
RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL"
49
-ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin
50
-ENV MAKE /usr/bin/make
49
+ENV PATH=$PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin
50
+ENV MAKE=/usr/bin/make
51
# As a final step configure the user (if env is defined)
52
ARG USER
53
ARG UID
tests/docker/dockerfiles/debian-loongarch-cross.docker
+5
-5
@@ -40,12 +40,12 @@ RUN apt-get update && \
40
RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2023.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \
41
| tar -xJC /opt
42
43
-ENV PATH $PATH:/opt/cross-tools/bin
44
-ENV LD_LIBRARY_PATH /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH
43
+ENV PATH=$PATH:/opt/cross-tools/bin
44
+ENV LD_LIBRARY_PATH=/opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH
45
46
-ENV QEMU_CONFIGURE_OPTS --disable-docs --disable-tools
47
-ENV DEF_TARGET_LIST loongarch64-linux-user,loongarch64-softmmu
48
-ENV MAKE /usr/bin/make
46
+ENV QEMU_CONFIGURE_OPTS="--disable-docs --disable-tools"
47
+ENV DEF_TARGET_LIST=loongarch64-linux-user,loongarch64-softmmu
48
+ENV MAKE=/usr/bin/make
49
50
# As a final step configure the user (if env is defined)
51
ARG USER
tests/docker/dockerfiles/debian-tricore-cross.docker
+3
-3
@@ -40,9 +40,9 @@ RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/trico
40
| tar -xzC /usr/local/
41
42
# This image can only build a very minimal QEMU as well as the tests
43
-ENV DEF_TARGET_LIST tricore-softmmu
44
-ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt
45
-ENV MAKE /usr/bin/make
43
+ENV DEF_TARGET_LIST=tricore-softmmu
44
+ENV QEMU_CONFIGURE_OPTS="--disable-user --disable-tools --disable-fdt"
45
+ENV MAKE=/usr/bin/make
46
# As a final step configure the user (if env is defined)
47
ARG USER
48
ARG UID
tests/docker/dockerfiles/debian-xtensa-cross.docker
+4
-4
@@ -19,16 +19,16 @@ RUN apt-get update && \
19
python3-minimal && \
20
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
21
22
-ENV CPU_LIST dc232b dc233c de233_fpu dsp3400
23
-ENV TOOLCHAIN_RELEASE 2020.07
22
+ENV CPU_LIST="dc232b dc233c de233_fpu dsp3400"
23
+ENV TOOLCHAIN_RELEASE=2020.07
24
25
RUN for cpu in $CPU_LIST; do \
26
curl -#SL http://github.com/foss-xtensa/toolchain/releases/download/$TOOLCHAIN_RELEASE/x86_64-$TOOLCHAIN_RELEASE-xtensa-$cpu-elf.tar.gz \
27
| tar -xzC /opt; \
28
done
29
30
-ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin
31
-ENV MAKE /usr/bin/make
30
+ENV PATH=$PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin
31
+ENV MAKE=/usr/bin/make
32
# As a final step configure the user (if env is defined)
33
ARG USER
34
ARG UID
tests/docker/dockerfiles/python.docker
+3
-2
@@ -4,7 +4,7 @@ FROM fedora:latest
4
MAINTAINER John Snow <jsnow@redhat.com>
5
6
# Please keep this list sorted alphabetically
7
-ENV PACKAGES \
7
+ENV PACKAGES="\
8
gcc \
9
make \
10
python3 \
@@ -15,7 +15,8 @@ ENV PACKAGES \
15
python3.11 \
16
python3.12 \
17
python3.13 \
18
- python3.9
18
+ python3.9 \
19
+ "
20
21
RUN dnf install -y $PACKAGES
22
RUN rpm -q $PACKAGES | sort > /packages.txt