Rollup merge of #153533 - homersimpsons:chore/fix-LegacyKeyValueFormat-miscellaneous, r=marcoieni

Fix LegacyKeyValueFormat report from docker build: miscellaneous

Part of #152305

Those are the remaining Dockerfile to fix once the other merge requests are merged. Note that this merge request can still be merged before the others.

r? @marcoieni

Author: JonathanBrouwer

src/ci/docker/host-x86_64/dist-android/Dockerfile

@@ -16,15 +16,14 @@ ENV TARGETS=$TARGETS,i686-linux-android
 ENV TARGETS=$TARGETS,aarch64-linux-android
 ENV TARGETS=$TARGETS,x86_64-linux-android
 
-ENV RUST_CONFIGURE_ARGS \
-      --enable-extended \
+ENV RUST_CONFIGURE_ARGS="--enable-extended \
       --enable-profiler \
       --android-ndk=/android/ndk/ \
-      --disable-docs
+      --disable-docs"
 
 ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
 
-ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
+ENV SCRIPT="python3 ../x.py dist --host= --target $TARGETS"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile

@@ -45,14 +45,13 @@ ENV TARGETS=$HOSTS
 ENV TARGETS=$TARGETS,loongarch64-unknown-none
 ENV TARGETS=$TARGETS,loongarch64-unknown-none-softfloat
 
-ENV RUST_CONFIGURE_ARGS \
-      --enable-extended \
+ENV RUST_CONFIGURE_ARGS="--enable-extended \
       --enable-full-tools \
       --enable-profiler \
       --enable-sanitizers \
       --disable-docs \
       --set rust.jemalloc \
       --set rust.lto=thin \
-      --set rust.codegen-units=1
+      --set rust.codegen-units=1"
 
-ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $TARGETS
+ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $TARGETS"

src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile

@@ -27,8 +27,7 @@ ENV CC_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-gcc \
 
 ENV HOSTS=loongarch64-unknown-linux-musl
 
-ENV RUST_CONFIGURE_ARGS \
-      --enable-extended \
+ENV RUST_CONFIGURE_ARGS="--enable-extended \
       --enable-full-tools \
       --enable-profiler \
       --enable-sanitizers \
@@ -37,6 +36,6 @@ ENV RUST_CONFIGURE_ARGS \
       --set rust.lto=thin \
       --set rust.codegen-units=1 \
       --set target.loongarch64-unknown-linux-musl.crt-static=false \
-      --musl-root-loongarch64=/x-tools/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot/usr
+      --musl-root-loongarch64=/x-tools/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot/usr"
 
-ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
+ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"

src/ci/docker/host-x86_64/dist-riscv64-linux/Dockerfile

@@ -29,5 +29,5 @@ ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
 ENV HOSTS=riscv64gc-unknown-linux-gnu
 ENV TARGETS=riscv64gc-unknown-linux-gnu,riscv64a23-unknown-linux-gnu
 
-ENV RUST_CONFIGURE_ARGS --enable-extended --enable-profiler --disable-docs
-ENV SCRIPT python3 ../x.py dist --target $TARGETS --host $HOSTS
+ENV RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --disable-docs"
+ENV SCRIPT="python3 ../x.py dist --target $TARGETS --host $HOSTS"

src/ci/docker/host-x86_64/dist-s390x-linux/Dockerfile

@@ -26,5 +26,5 @@ ENV \
 
 ENV HOSTS=s390x-unknown-linux-gnu
 
-ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-sanitizers --enable-profiler --disable-docs
-ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
+ENV RUST_CONFIGURE_ARGS="--enable-extended --enable-lld --enable-sanitizers --enable-profiler --disable-docs"
+ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"

src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile

@@ -32,5 +32,5 @@ ENV \
 
 ENV HOSTS=sparcv9-sun-solaris
 
-ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
-ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
+ENV RUST_CONFIGURE_ARGS="--enable-extended --disable-docs"
+ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"

src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile

@@ -38,31 +38,29 @@ COPY scripts/shared.sh /tmp/
 COPY scripts/build-fuchsia-toolchain.sh /tmp/
 RUN /tmp/build-fuchsia-toolchain.sh
 
-ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar
-ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \
-  -C panic=abort \
+ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR="/usr/local/bin/llvm-ar"
+ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS="-C panic=abort \
   -C force-unwind-tables=yes \
   -C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \
   -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \
-  -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib
+  -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib"
 
 ENV TARGETS=x86_64-unknown-fuchsia
 ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_INSTALL_DIR /checkout/obj/install
+ENV RUST_INSTALL_DIR="/checkout/obj/install"
 RUN mkdir -p $RUST_INSTALL_DIR/etc
 
 # Fuchsia only supports LLVM.
-ENV CODEGEN_BACKENDS llvm
+ENV CODEGEN_BACKENDS="llvm"
 
 # download-rustc is not allowed for `x install`
-ENV NO_DOWNLOAD_CI_RUSTC 1
+ENV NO_DOWNLOAD_CI_RUSTC="1"
 
-ENV RUST_CONFIGURE_ARGS \
-  --prefix=$RUST_INSTALL_DIR \
+ENV RUST_CONFIGURE_ARGS="--prefix=$RUST_INSTALL_DIR \
   --sysconfdir=etc \
   --enable-lld \
   --llvm-libunwind=in-tree \
@@ -72,8 +70,7 @@ ENV RUST_CONFIGURE_ARGS \
   --set target.x86_64-unknown-fuchsia.cxx=/usr/local/bin/clang++ \
   --set target.x86_64-unknown-fuchsia.ar=/usr/local/bin/llvm-ar \
   --set target.x86_64-unknown-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \
-  --set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld
+  --set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld"
 
-ENV SCRIPT \
-    python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
-    bash ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh
+ENV SCRIPT="python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
+    bash ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh"

src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile

@@ -34,7 +34,7 @@ RUN sh /scripts/sccache.sh
 # RfL needs access to cland, lld and llvm tools
 ENV PATH="${PATH}:/usr/lib/llvm-15/bin"
 
-ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
+ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu"
 
 COPY /scripts/rfl-build.sh /tmp/rfl-build.sh
-ENV SCRIPT bash /tmp/rfl-build.sh
+ENV SCRIPT="bash /tmp/rfl-build.sh"