diff options
22 files changed, 51 insertions, 51 deletions
diff --git a/lcitool/formatters.py b/lcitool/formatters.py index 35a27c7..c26cf22 100644 --- a/lcitool/formatters.py +++ b/lcitool/formatters.py @@ -565,7 +565,7 @@ class DockerfileFormatter(BuildEnvFormatter): lines = [] for key in sorted(env.keys()): val = env[key] - lines.append(f'\nENV {key} "{val}"') + lines.append(f'\nENV {key}="{val}"') return "".join(lines) def _format_section_base(self, target: BuildTarget) -> List[str]: diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile b/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile index 8eab3e6..cf1bb07 100644 --- a/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile +++ b/tests/data/formatters/out/libvirt-debian-sid-s390x-cross-aarch64-combined.Dockerfile @@ -48,11 +48,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-reconfigure locales && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED -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 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" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -113,5 +113,5 @@ endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc -ENV ABI "aarch64-linux-gnu" -ENV MESON_OPTS "--cross-file=aarch64-linux-gnu"
\ No newline at end of file +ENV ABI="aarch64-linux-gnu" +ENV MESON_OPTS="--cross-file=aarch64-linux-gnu"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile b/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile index f36a324..8dd8d01 100644 --- a/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile +++ b/tests/data/formatters/out/libvirt-debian-sid-s390x.Dockerfile @@ -88,8 +88,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ 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"
\ No newline at end of file +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"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-12-common-cross-s390x.Dockerfile b/tests/data/formatters/out/libvirt-go-debian-12-common-cross-s390x.Dockerfile index d99d2d5..4e6fe89 100644 --- a/tests/data/formatters/out/libvirt-go-debian-12-common-cross-s390x.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-debian-12-common-cross-s390x.Dockerfile @@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -46,4 +46,4 @@ endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -ENV ABI "s390x-linux-gnu"
\ No newline at end of file +ENV ABI="s390x-linux-gnu"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-12-cross-s390x.Dockerfile b/tests/data/formatters/out/libvirt-go-debian-12-cross-s390x.Dockerfile index beab34f..b970df3 100644 --- a/tests/data/formatters/out/libvirt-go-debian-12-cross-s390x.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-debian-12-cross-s390x.Dockerfile @@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -46,4 +46,4 @@ endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -ENV ABI "s390x-linux-gnu"
\ No newline at end of file +ENV ABI="s390x-linux-gnu"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-debian-12.Dockerfile b/tests/data/formatters/out/libvirt-go-debian-12.Dockerfile index f07a9d6..9b7a2ae 100644 --- a/tests/data/formatters/out/libvirt-go-debian-12.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-debian-12.Dockerfile @@ -22,5 +22,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-fedora-rawhide-common-cross-mingw64-foreign.Dockerfile b/tests/data/formatters/out/libvirt-go-fedora-rawhide-common-cross-mingw64-foreign.Dockerfile index 2a3c6c0..701c879 100644 --- a/tests/data/formatters/out/libvirt-go-fedora-rawhide-common-cross-mingw64-foreign.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-fedora-rawhide-common-cross-mingw64-foreign.Dockerfile @@ -10,4 +10,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV ABI "x86_64-w64-mingw32"
\ No newline at end of file +ENV ABI="x86_64-w64-mingw32"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-combined.Dockerfile b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-combined.Dockerfile index be65d01..459618a 100644 --- a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-combined.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-combined.Dockerfile @@ -21,8 +21,8 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN nosync dnf install -y \ mingw64-gcc \ @@ -34,4 +34,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV ABI "x86_64-w64-mingw32"
\ No newline at end of file +ENV ABI="x86_64-w64-mingw32"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-foreign.Dockerfile b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-foreign.Dockerfile index 342f343..f544f21 100644 --- a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-foreign.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-foreign.Dockerfile @@ -10,4 +10,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV ABI "x86_64-w64-mingw32"
\ No newline at end of file +ENV ABI="x86_64-w64-mingw32"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-native.Dockerfile b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-native.Dockerfile index 78514f3..6ad3e95 100644 --- a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-native.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64-native.Dockerfile @@ -21,5 +21,5 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64.Dockerfile b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64.Dockerfile index be65d01..459618a 100644 --- a/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-fedora-rawhide-cross-mingw64.Dockerfile @@ -21,8 +21,8 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN nosync dnf install -y \ mingw64-gcc \ @@ -34,4 +34,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV ABI "x86_64-w64-mingw32"
\ No newline at end of file +ENV ABI="x86_64-w64-mingw32"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile index 69a4e62..fc3a0e0 100644 --- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile @@ -13,4 +13,4 @@ RUN dnf update -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile index e45a87e..dec21d1 100644 --- a/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-xml-module-alpine-edge.Dockerfile @@ -8,4 +8,4 @@ RUN apk update && \ go && \ apk list --installed | sort > /packages.txt -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-debian-12.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-debian-12.Dockerfile index 58c10fd..63ae9bb 100644 --- a/tests/data/formatters/out/libvirt-go-xml-module-debian-12.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-xml-module-debian-12.Dockerfile @@ -15,4 +15,4 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg-reconfigure locales && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.Dockerfile index be3a59b..5b0f42e 100644 --- a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.Dockerfile @@ -10,4 +10,4 @@ RUN zypper update -y && \ zypper clean --all && \ rpm -qa | sort > /packages.txt -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-tumbleweed.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-tumbleweed.Dockerfile index cb1bdcf..15896c8 100644 --- a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-tumbleweed.Dockerfile +++ b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-tumbleweed.Dockerfile @@ -9,4 +9,4 @@ RUN zypper dist-upgrade -y && \ zypper clean --all && \ rpm -qa | sort > /packages.txt -ENV LANG "en_US.UTF-8"
\ No newline at end of file +ENV LANG="en_US.UTF-8"
\ No newline at end of file diff --git a/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile b/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile index bdf52f0..1974e98 100644 --- a/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile +++ b/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile @@ -21,5 +21,5 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" diff --git a/tests/data/manifest/out/ci/containers/debian-12.Dockerfile b/tests/data/manifest/out/ci/containers/debian-12.Dockerfile index ec19d5a..0047cbf 100644 --- a/tests/data/manifest/out/ci/containers/debian-12.Dockerfile +++ b/tests/data/manifest/out/ci/containers/debian-12.Dockerfile @@ -22,5 +22,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" diff --git a/tests/data/manifest/out/ci/containers/debian-sid-cross-i686.Dockerfile b/tests/data/manifest/out/ci/containers/debian-sid-cross-i686.Dockerfile index d967c28..d6b4af1 100644 --- a/tests/data/manifest/out/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/tests/data/manifest/out/ci/containers/debian-sid-cross-i686.Dockerfile @@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -46,4 +46,4 @@ endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc -ENV ABI "i686-linux-gnu" +ENV ABI="i686-linux-gnu" diff --git a/tests/data/manifest/out/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/tests/data/manifest/out/ci/containers/debian-sid-cross-ppc64le.Dockerfile index da67dcd..e370529 100644 --- a/tests/data/manifest/out/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/tests/data/manifest/out/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -46,4 +46,4 @@ endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc -ENV ABI "powerpc64le-linux-gnu" +ENV ABI="powerpc64le-linux-gnu" diff --git a/tests/data/manifest/out/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/tests/data/manifest/out/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index e7a4629..3adbde9 100644 --- a/tests/data/manifest/out/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/tests/data/manifest/out/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -21,8 +21,8 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" RUN nosync dnf install -y \ mingw32-gcc \ @@ -34,4 +34,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc -ENV ABI "i686-w64-mingw32" +ENV ABI="i686-w64-mingw32" diff --git a/tests/data/manifest/out/ci/containers/fedora-rawhide.Dockerfile b/tests/data/manifest/out/ci/containers/fedora-rawhide.Dockerfile index e91fc18..0d4b78d 100644 --- a/tests/data/manifest/out/ci/containers/fedora-rawhide.Dockerfile +++ b/tests/data/manifest/out/ci/containers/fedora-rawhide.Dockerfile @@ -28,5 +28,5 @@ exec "$@"\n' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" |