From nobody Sun Feb 8 10:34:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606836449; cv=none; d=zohomail.com; s=zohoarc; b=cg0XrMm1wrBRLlh72uMepAKDbrR8vYkdNxlkg1NAvQkuJ04uJ41tYUeLxGj0y7fipVwCEQjVXKALydGeAgIqsTsn4pyDWx64kcnZFCtXZnHNQX6UTRaiUYzHzvK4nxYgWCkxGAI8ZN/7poa9o2QEpc4L3jm3vRZ/NcQ+duCPhyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606836449; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KZZ5aUIKWlS25Gh486mxEa9YC53wAJ3qWVUS17eJbb8=; b=SvDM/dqOBTDkBjF6npJ/NtUUjtRmXuf04lFtTuUhwpr+XRhFtkpv3DIkzThNojiGMqKj5rfv4k5zZcCInwnjMhUdwP1iWAY8eAiSYIpi4OzDU/Iucbh4M+ayxe5jO+rQY9VJevCgvwvuvNHhvMjMFSrVk9TAG9i1BS0S7rhDWrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606836449279648.7361942867075; Tue, 1 Dec 2020 07:27:29 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-559-13Yh3YtXMCq_t6l1THJfvQ-1; Tue, 01 Dec 2020 10:27:23 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F18C8042A9; Tue, 1 Dec 2020 15:27:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B9425D9C2; Tue, 1 Dec 2020 15:27:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 465AF50030; Tue, 1 Dec 2020 15:27:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B1FQwk7021424 for ; Tue, 1 Dec 2020 10:26:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 912515D9DD; Tue, 1 Dec 2020 15:26:58 +0000 (UTC) Received: from fedora.redhat.com (ovpn-115-4.ams2.redhat.com [10.36.115.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id C03785D9CA; Tue, 1 Dec 2020 15:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606836446; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=KZZ5aUIKWlS25Gh486mxEa9YC53wAJ3qWVUS17eJbb8=; b=WyL6DaoW59v6lYW7rPzqsINsIK5n0OSmruOS04L7qaSsswIq9Zt5uIuhhEeZ9K81ehpX4W Y3tyFzbfDwsfo/MMp0evHJ9EWVfHAyt86sVzxVxlnfFXTgHq5hrn3sjPv3LF5bUqmeBxGk DWClvTGoP/mU18O1MeoA4SO8JedJVww= X-MC-Unique: 13Yh3YtXMCq_t6l1THJfvQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] gitlab: refresh containers with lcitool for fully minimized base Date: Tue, 1 Dec 2020 15:26:48 +0000 Message-Id: <20201201152649.2230442-3-berrange@redhat.com> In-Reply-To: <20201201152649.2230442-1-berrange@redhat.com> References: <20201201152649.2230442-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Daniel P. Berrang=C3=A9 --- 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/libv= irt-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=3D=3D0.54.0 =20 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/libv= irt-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=3D=3D0.54.0 =20 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=3D=3D0.54.0 =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -114,11 +112,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "aarch64-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/c= ontainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "arm-linux-gnueabi" diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/c= ontainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -114,11 +112,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "arm-linux-gnueabihf" diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/con= tainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "i686-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/con= tainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "mips64el-linux-gnuabi64" diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/c= ontainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "powerpc64le-linux-gnu" diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/co= ntainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -113,11 +111,9 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" =20 ENV ABI "s390x-linux-gnu" diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/lib= virt-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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -95,9 +93,7 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'aarch64'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu =20 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" =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'arm'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi =20 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" =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'armhf'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf =20 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" =20 ENV ABI "arm-linux-gnueabihf" diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/co= ntainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'i686'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/i686-linux-gnu =20 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" =20 ENV ABI "i686-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/c= i/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'mips64el'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 =20 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" =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'mipsel'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu =20 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" =20 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 'powerpc64le'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu =20 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" =20 ENV ABI "powerpc64le-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/c= ontainers/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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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 =3D 's390x'\n\ endian =3D 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu =20 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" =20 ENV ABI "s390x-linux-gnu" diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/li= bvirt-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=3Dnoninteractive && \ 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=3Dnoninteractive && \ 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=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 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/lib= virt-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) =20 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/lib= virt-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) =20 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 =20 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" =20 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 =20 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" =20 ENV ABI "x86_64-w64-mingw32" diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/container= s/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) =20 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=3D=3D0.54.0 =20 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/l= ibvirt-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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -97,9 +95,7 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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/l= ibvirt-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=3Dnoninteractive && \ 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=3Dnoninteractive && \ numad \ open-iscsi \ parted \ - patch \ perl \ pkgconf \ policykit-1 \ @@ -96,9 +94,7 @@ RUN pip3 install \ meson=3D=3D0.54.0 =20 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" --=20 2.28.0