On Mon, May 18, 2026 at 5:23 AM Philippe Mathieu-Daudé <[email protected]> wrote: > > 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é <[email protected]> > --- > .../docker/dockerfiles/debian-hexagon-cross.docker | 14 +++++++------- > .../dockerfiles/debian-loongarch-cross.docker | 10 +++++----- > .../docker/dockerfiles/debian-tricore-cross.docker | 6 +++--- > .../docker/dockerfiles/debian-xtensa-cross.docker | 8 ++++---- > tests/docker/dockerfiles/python.docker | 5 +++-- > scripts/coverity-scan/coverity-scan.docker | 12 ++++++------ > 6 files changed, 28 insertions(+), 27 deletions(-) > > diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker > b/tests/docker/dockerfiles/debian-hexagon-cross.docker > index 91d4b71ac95..3c94f040b81 100644 > --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker > +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker > @@ -39,15 +39,15 @@ RUN apt-get update && \ > ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \ > dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > > /packages.txt > > -ENV TOOLCHAIN_INSTALL /opt > -ENV TOOLCHAIN_RELEASE 12.Dec.2023 > -ENV TOOLCHAIN_BASENAME > "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl" > -ENV TOOLCHAIN_URL > https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz > -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" > +ENV TOOLCHAIN_INSTALL=/opt > +ENV TOOLCHAIN_RELEASE=12.Dec.2023 > +ENV > TOOLCHAIN_BASENAME=clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl > +ENV > TOOLCHAIN_URL=https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz > +ENV CCACHE_WRAPPERSDIR=/usr/libexec/ccache-wrappers
Reviewed-by: Brian Cain <[email protected]> > RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL" > -ENV PATH > $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin > -ENV MAKE /usr/bin/make > +ENV > PATH=$PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin > +ENV MAKE=/usr/bin/make > # As a final step configure the user (if env is defined) > ARG USER > ARG UID > diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker > b/tests/docker/dockerfiles/debian-loongarch-cross.docker > index 55b3dbe4510..d2ba07972ce 100644 > --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker > +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker > @@ -40,12 +40,12 @@ RUN apt-get update && \ > 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 > \ > | tar -xJC /opt > > -ENV PATH $PATH:/opt/cross-tools/bin > -ENV LD_LIBRARY_PATH > /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH > +ENV PATH=$PATH:/opt/cross-tools/bin > +ENV > LD_LIBRARY_PATH=/opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH > > -ENV QEMU_CONFIGURE_OPTS --disable-docs --disable-tools > -ENV DEF_TARGET_LIST loongarch64-linux-user,loongarch64-softmmu > -ENV MAKE /usr/bin/make > +ENV QEMU_CONFIGURE_OPTS="--disable-docs --disable-tools" > +ENV DEF_TARGET_LIST=loongarch64-linux-user,loongarch64-softmmu > +ENV MAKE=/usr/bin/make > > # As a final step configure the user (if env is defined) > ARG USER > diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker > b/tests/docker/dockerfiles/debian-tricore-cross.docker > index fd797dc7ee4..9e7ff321677 100644 > --- a/tests/docker/dockerfiles/debian-tricore-cross.docker > +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker > @@ -40,9 +40,9 @@ RUN curl -#SL > https://github.com/bkoppelmann/package_940/releases/download/trico > | tar -xzC /usr/local/ > > # This image can only build a very minimal QEMU as well as the tests > -ENV DEF_TARGET_LIST tricore-softmmu > -ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt > -ENV MAKE /usr/bin/make > +ENV DEF_TARGET_LIST=tricore-softmmu > +ENV QEMU_CONFIGURE_OPTS="--disable-user --disable-tools --disable-fdt" > +ENV MAKE=/usr/bin/make > # As a final step configure the user (if env is defined) > ARG USER > ARG UID > diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker > b/tests/docker/dockerfiles/debian-xtensa-cross.docker > index ef63e44e2ef..d9130fc3378 100644 > --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker > +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker > @@ -19,16 +19,16 @@ RUN apt-get update && \ > python3-minimal && \ > dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > > /packages.txt > > -ENV CPU_LIST dc232b dc233c de233_fpu dsp3400 > -ENV TOOLCHAIN_RELEASE 2020.07 > +ENV CPU_LIST="dc232b dc233c de233_fpu dsp3400" > +ENV TOOLCHAIN_RELEASE=2020.07 > > RUN for cpu in $CPU_LIST; do \ > curl -#SL > http://github.com/foss-xtensa/toolchain/releases/download/$TOOLCHAIN_RELEASE/x86_64-$TOOLCHAIN_RELEASE-xtensa-$cpu-elf.tar.gz > \ > | tar -xzC /opt; \ > done > > -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 > -ENV MAKE /usr/bin/make > +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 > +ENV MAKE=/usr/bin/make > # As a final step configure the user (if env is defined) > ARG USER > ARG UID > diff --git a/tests/docker/dockerfiles/python.docker > b/tests/docker/dockerfiles/python.docker > index 59e70a02484..79c554a2d87 100644 > --- a/tests/docker/dockerfiles/python.docker > +++ b/tests/docker/dockerfiles/python.docker > @@ -4,7 +4,7 @@ FROM fedora:latest > MAINTAINER John Snow <[email protected]> > > # Please keep this list sorted alphabetically > -ENV PACKAGES \ > +ENV PACKAGES="\ > gcc \ > make \ > python3 \ > @@ -15,7 +15,8 @@ ENV PACKAGES \ > python3.11 \ > python3.12 \ > python3.13 \ > - python3.9 > + python3.9 \ > + " > > RUN dnf install -y $PACKAGES > RUN rpm -q $PACKAGES | sort > /packages.txt > diff --git a/scripts/coverity-scan/coverity-scan.docker > b/scripts/coverity-scan/coverity-scan.docker > index a349578526d..bb9db40f27a 100644 > --- a/scripts/coverity-scan/coverity-scan.docker > +++ b/scripts/coverity-scan/coverity-scan.docker > @@ -153,12 +153,12 @@ exec "$@"' > /usr/bin/nosync && \ > ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ > ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc > > -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" > -ENV LANG "en_US.UTF-8" > -ENV MAKE "/usr/bin/make" > -ENV NINJA "/usr/bin/ninja" > -ENV PYTHON "/usr/bin/python3" > -ENV QEMU_CONFIGURE_OPTS --meson=internal > +ENV CCACHE_WRAPPERSDIR=/usr/libexec/ccache-wrappers > +ENV LANG=en_US.UTF-8 > +ENV MAKE=/usr/bin/make > +ENV NINJA=/usr/bin/ninja > +ENV PYTHON=/usr/bin/python3 > +ENV QEMU_CONFIGURE_OPTS=--meson=internal > > RUN dnf install -y curl wget > ENV COVERITY_TOOL_BASE=/coverity-tools > -- > 2.53.0 >
