[libvirt PATCH 2/3] gitlab: refresh containers with lcitool for fully minimized base

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- ci/containers/libvirt-centos-7.Dockerfile | 6 +----- ci/containers/libvirt-centos-8.Dockerfile | 6 +----- ci/containers/libvirt-centos-stream.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-i686.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-mips.Dockerfile | 6 +----- .../libvirt-debian-10-cross-mips64el.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile | 6 +----- ci/containers/libvirt-debian-10-cross-s390x.Dockerfile | 6 +----- ci/containers/libvirt-debian-10.Dockerfile | 6 +----- .../libvirt-debian-sid-cross-aarch64.Dockerfile | 9 +-------- ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile | 9 +-------- ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile | 9 +-------- ci/containers/libvirt-debian-sid-cross-i686.Dockerfile | 9 +-------- .../libvirt-debian-sid-cross-mips64el.Dockerfile | 9 +-------- ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile | 9 +-------- .../libvirt-debian-sid-cross-ppc64le.Dockerfile | 9 +-------- ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile | 9 +-------- ci/containers/libvirt-debian-sid.Dockerfile | 9 +-------- ci/containers/libvirt-fedora-32.Dockerfile | 9 +-------- ci/containers/libvirt-fedora-33.Dockerfile | 9 +-------- .../libvirt-fedora-rawhide-cross-mingw32.Dockerfile | 9 +-------- .../libvirt-fedora-rawhide-cross-mingw64.Dockerfile | 9 +-------- ci/containers/libvirt-fedora-rawhide.Dockerfile | 9 +-------- ci/containers/libvirt-opensuse-151.Dockerfile | 6 +----- ci/containers/libvirt-ubuntu-1804.Dockerfile | 6 +----- ci/containers/libvirt-ubuntu-2004.Dockerfile | 6 +----- 30 files changed, 30 insertions(+), 192 deletions(-) diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile index ea460f76c9..d94f335c9d 100644 --- a/ci/containers/libvirt-centos-7.Dockerfile +++ b/ci/containers/libvirt-centos-7.Dockerfile @@ -36,7 +36,6 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ audit-libs-devel \ augeas \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -44,6 +43,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -89,9 +89,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ numad \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ @@ -119,9 +117,7 @@ RUN pip3 install \ meson==0.54.0 ENV LANG "en_US.UTF-8" - ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja-build" ENV PYTHON "/usr/bin/python3" - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile index 633a60dcd4..568e23af76 100644 --- a/ci/containers/libvirt-centos-8.Dockerfile +++ b/ci/containers/libvirt-centos-8.Dockerfile @@ -9,7 +9,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ audit-libs-devel \ augeas \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -17,6 +16,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -62,9 +62,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ numad \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ @@ -94,9 +92,7 @@ RUN pip3 install \ meson==0.54.0 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" diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile index 8256e26944..f1ecab837a 100644 --- a/ci/containers/libvirt-centos-stream.Dockerfile +++ b/ci/containers/libvirt-centos-stream.Dockerfile @@ -10,7 +10,6 @@ RUN dnf install -y centos-release-stream && \ audit-libs-devel \ augeas \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -18,6 +17,7 @@ RUN dnf install -y centos-release-stream && \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -63,9 +63,7 @@ RUN dnf install -y centos-release-stream && \ numad \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ @@ -95,9 +93,7 @@ RUN pip3 install \ meson==0.54.0 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" diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile index c0ccaad8f2..1c755908f2 100644 --- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -114,11 +112,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "aarch64-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile index 384ced7c4b..327b4f7e7e 100644 --- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "arm-linux-gnueabi" diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile index 026a6653b6..d73de0d4d2 100644 --- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -114,11 +112,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "arm-linux-gnueabihf" diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile index 494ed5bc59..41922b7582 100644 --- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "i686-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile index 47d6fc627e..369a8a7e42 100644 --- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "mips-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile index dfb2fb0342..c8f6bd818f 100644 --- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "mips64el-linux-gnuabi64" diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile index 13d3b7ccbd..81de62b44b 100644 --- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "mipsel-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile index b3a2c506d8..c4dcd63431 100644 --- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "powerpc64le-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile index 770f79c132..9a5f8edbe5 100644 --- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson==0.54.0 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 ABI "s390x-linux-gnu" diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile index 86cca736a7..9858584b03 100644 --- a/ci/containers/libvirt-debian-10.Dockerfile +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -66,7 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -95,9 +93,7 @@ RUN pip3 install \ meson==0.54.0 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" diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile index cf9b9114c9..dff7cb620e 100644 --- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -112,11 +107,9 @@ cpu = 'aarch64'\n\ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu 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 ABI "aarch64-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile index 407fd06372..f3a168be3b 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -111,11 +106,9 @@ cpu = 'arm'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi 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 ABI "arm-linux-gnueabi" diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile index 924bad941f..88f1033ed5 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -112,11 +107,9 @@ cpu = 'armhf'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf 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 ABI "arm-linux-gnueabihf" diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile index 81fca80809..e34c8074d9 100644 --- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -111,11 +106,9 @@ cpu = 'i686'\n\ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu 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 ABI "i686-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile index 20e0307b2a..eaf1bf5641 100644 --- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -111,11 +106,9 @@ cpu = 'mips64el'\n\ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 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 ABI "mips64el-linux-gnuabi64" diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile index 9363cdd8ba..424f97315d 100644 --- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -111,11 +106,9 @@ cpu = 'mipsel'\n\ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu 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 ABI "mipsel-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile index 3e3311a43b..311106e337 100644 --- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -111,11 +106,9 @@ cpu = 'powerpc64le'\n\ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu 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 ABI "powerpc64le-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile index aa04a19a7a..ee188c0a20 100644 --- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -111,11 +106,9 @@ cpu = 's390x'\n\ endian = 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu 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 ABI "s390x-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile index dd1c52ab47..d914d5d6c2 100644 --- a/ci/containers/libvirt-debian-sid.Dockerfile +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -67,15 +66,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-utils \ radvd \ scrub \ @@ -93,9 +88,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) 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" diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile index 88c181a746..8be1754ac5 100644 --- a/ci/containers/libvirt-fedora-32.Dockerfile +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -5,7 +5,6 @@ RUN dnf update -y && \ audit-libs-devel \ augeas \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -14,6 +13,7 @@ RUN dnf update -y && \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -60,17 +60,12 @@ RUN dnf update -y && \ numad \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ readline-devel \ @@ -92,9 +87,7 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) 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" diff --git a/ci/containers/libvirt-fedora-33.Dockerfile b/ci/containers/libvirt-fedora-33.Dockerfile index 25aaf0567f..237bd8ba75 100644 --- a/ci/containers/libvirt-fedora-33.Dockerfile +++ b/ci/containers/libvirt-fedora-33.Dockerfile @@ -5,7 +5,6 @@ RUN dnf update -y && \ audit-libs-devel \ augeas \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -14,6 +13,7 @@ RUN dnf update -y && \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -60,17 +60,12 @@ RUN dnf update -y && \ numad \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ readline-devel \ @@ -92,9 +87,7 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) 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" diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile index faa1550859..32527e8e56 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile @@ -4,12 +4,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ augeas \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ cppi \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -31,16 +31,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ninja-build \ numad \ parted \ - patch \ perl \ - perl-App-cpanminus \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ rpcgen \ @@ -71,11 +66,9 @@ RUN dnf install -y \ dnf clean all -y 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 ABI "i686-w64-mingw32" diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile index 7def8fd890..e82de31df9 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile @@ -4,12 +4,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ augeas \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ cppi \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -31,16 +31,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ninja-build \ numad \ parted \ - patch \ perl \ - perl-App-cpanminus \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ rpcgen \ @@ -71,11 +66,9 @@ RUN dnf install -y \ dnf clean all -y 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 ABI "x86_64-w64-mingw32" diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile index 31219df996..ee2f0fcfc1 100644 --- a/ci/containers/libvirt-fedora-rawhide.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -6,7 +6,6 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ audit-libs-devel \ augeas \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -15,6 +14,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -61,17 +61,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ numad \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ readline-devel \ @@ -93,9 +88,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) 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" diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile index 030581d7ec..c2d088f004 100644 --- a/ci/containers/libvirt-opensuse-151.Dockerfile +++ b/ci/containers/libvirt-opensuse-151.Dockerfile @@ -6,7 +6,6 @@ RUN zypper update -y && \ augeas \ augeas-lenses \ avahi-devel \ - bash \ bash-completion \ ca-certificates \ ccache \ @@ -15,6 +14,7 @@ RUN zypper update -y && \ cyrus-sasl-devel \ dbus-1-devel \ device-mapper-devel \ + diffutils \ dnsmasq \ dwarves \ ebtables \ @@ -59,9 +59,7 @@ RUN zypper update -y && \ open-iscsi \ parted \ parted-devel \ - patch \ perl \ - perl-App-cpanminus \ pkgconfig \ polkit \ python3 \ @@ -90,9 +88,7 @@ RUN pip3 install \ meson==0.54.0 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" diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile index daa406c2f3..3a5362e128 100644 --- a/ci/containers/libvirt-ubuntu-1804.Dockerfile +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -67,7 +66,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -97,9 +95,7 @@ RUN pip3 install \ meson==0.54.0 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" diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile index dacf7429ff..41a3f5995e 100644 --- a/ci/containers/libvirt-ubuntu-2004.Dockerfile +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - bash \ bash-completion \ ca-certificates \ ccache \ clang \ - cpanminus \ + diffutils \ dnsmasq-base \ dwarves \ ebtables \ @@ -67,7 +66,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -96,9 +94,7 @@ RUN pip3 install \ meson==0.54.0 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" -- 2.28.0