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>
This commit is contained in:
@@ -152,12 +152,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
|
||||
|
||||
@@ -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
|
||||
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -4,7 +4,7 @@ FROM fedora:latest
|
||||
MAINTAINER John Snow <jsnow@redhat.com>
|
||||
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user