From nobody Thu May 16 04:16:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606836652; cv=none; d=zohomail.com; s=zohoarc; b=ezv9YsMGYP0xO8jWcQPvN05zdGfa14iWyH40FABHv3tyGAkMb/VUyQARNUn0PmJayIWFIss20j17FDZZ7ihv18wLq//Qo6S2AZgl5Pdct8ZmhbL5UvMqm2RoANMndh2xVqh5GudsaH93L4hDHR6gvGUuTaXayHdGyrUYSXkcKh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606836652; 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=yP2u9orGTh9AH3Pqy0gsdtyIB09qxdqTcJbyCTUM4wE=; b=X112to9fNC9pVjHREh4hfRj3SxpgoqyoyGKq1V+6Fpghu5rF5tYyl7W2jZ75DxvzsrQy6B+t4kSPfFvCQUKEWZjopDcKoXplhxpRuL9CPRk4B+Re1KJwFPiy9JlvGND1ruV8LoPhyWXVX8YVErt/70clzt7jw3J4z7fsVKuQkDY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606836650901624.0921998378942; Tue, 1 Dec 2020 07:30:50 -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-118-4993tOGBOUOIsuRsvfOmRA-1; Tue, 01 Dec 2020 10:30:43 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 217031015C80; Tue, 1 Dec 2020 15:30:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEDDC60873; Tue, 1 Dec 2020 15:30:34 +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 984061809CA1; Tue, 1 Dec 2020 15:30:33 +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 0B1FQveD021412 for ; Tue, 1 Dec 2020 10:26:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 73D0B5D9DD; Tue, 1 Dec 2020 15:26:57 +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 948E85D9CA; Tue, 1 Dec 2020 15:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606836647; 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=yP2u9orGTh9AH3Pqy0gsdtyIB09qxdqTcJbyCTUM4wE=; b=b5Qhuq/WV4nxk1kvLR2pnEELevH+G91xwpZ5bYT3m2CXvz1YNYiRY3Tb0K8xzBsUrEtEQW 2nbNUV1fhMuaXc1rQkSZRxtoHdaKGELvATOZP+HBnaeLkGoY2qciq0phFYIFNWyBwOXRDW DvEh2DCc7fbB+99aeErMbVfVgTphSyo= X-MC-Unique: 4993tOGBOUOIsuRsvfOmRA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] gitlab: re-generate container images from lcitool Date: Tue, 1 Dec 2020 15:26:47 +0000 Message-Id: <20201201152649.2230442-2-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.13 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) This introduces Fedora 33 and removes some redundant packages. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Erik Skultety --- .gitlab-ci.yml | 20 +++++++++---------- ci/containers/libvirt-centos-7.Dockerfile | 15 +------------- ci/containers/libvirt-centos-8.Dockerfile | 16 ++------------- .../libvirt-centos-stream.Dockerfile | 16 ++------------- ...libvirt-debian-10-cross-aarch64.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-armv6l.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-armv7l.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-i686.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-mips.Dockerfile | 16 +-------------- ...ibvirt-debian-10-cross-mips64el.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-mipsel.Dockerfile | 16 +-------------- ...libvirt-debian-10-cross-ppc64le.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-s390x.Dockerfile | 16 +-------------- ci/containers/libvirt-debian-10.Dockerfile | 16 +-------------- ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 16 +-------------- ...libvirt-debian-sid-cross-armv6l.Dockerfile | 16 +-------------- ...libvirt-debian-sid-cross-armv7l.Dockerfile | 16 +-------------- .../libvirt-debian-sid-cross-i686.Dockerfile | 16 +-------------- ...bvirt-debian-sid-cross-mips64el.Dockerfile | 16 +-------------- ...libvirt-debian-sid-cross-mipsel.Dockerfile | 16 +-------------- ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 16 +-------------- .../libvirt-debian-sid-cross-s390x.Dockerfile | 16 +-------------- ci/containers/libvirt-debian-sid.Dockerfile | 16 +-------------- ci/containers/libvirt-fedora-32.Dockerfile | 15 +------------- ...ockerfile =3D> libvirt-fedora-33.Dockerfile} | 19 ++---------------- ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 15 +------------- ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 15 +------------- .../libvirt-fedora-rawhide.Dockerfile | 15 +------------- ci/containers/libvirt-opensuse-151.Dockerfile | 17 ++-------------- ci/containers/libvirt-ubuntu-1804.Dockerfile | 16 +-------------- ci/containers/libvirt-ubuntu-2004.Dockerfile | 16 +-------------- 31 files changed, 44 insertions(+), 455 deletions(-) rename ci/containers/{libvirt-fedora-31.Dockerfile =3D> libvirt-fedora-33.= Dockerfile} (88%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6792accf8f..f4f6aa8ee9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,15 +145,15 @@ x64-debian-sid-container: variables: NAME: debian-sid =20 -x64-fedora-31-container: +x64-fedora-32-container: <<: *container_job_definition variables: - NAME: fedora-31 + NAME: fedora-32 =20 -x64-fedora-32-container: +x64-fedora-33-container: <<: *container_job_definition variables: - NAME: fedora-32 + NAME: fedora-33 =20 x64-fedora-rawhide-container: <<: *container_job_definition @@ -334,20 +334,20 @@ x64-centos-stream: NAME: centos-stream RPM: skip =20 -x64-fedora-31: +x64-fedora-32: <<: *native_build_job_definition needs: - - x64-fedora-31-container + - x64-fedora-32-container variables: - NAME: fedora-31 + NAME: fedora-32 RPM: skip =20 -x64-fedora-32: +x64-fedora-33: <<: *native_build_job_definition needs: - - x64-fedora-32-container + - x64-fedora-33-container variables: - NAME: fedora-32 + NAME: fedora-33 =20 x64-fedora-rawhide: <<: *native_build_job_definition diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libv= irt-centos-7.Dockerfile index cff225ccc7..ea460f76c9 100644 --- a/ci/containers/libvirt-centos-7.Dockerfile +++ b/ci/containers/libvirt-centos-7.Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM registry.centos.org/centos:7 =20 RUN echo -e '[openvz]\n\ name=3DOpenVZ addons\n\ @@ -35,14 +35,11 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ yum install -y \ audit-libs-devel \ augeas \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cyrus-sasl-devel \ dbus-devel \ @@ -53,9 +50,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ firewalld-filesystem \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-common \ @@ -80,16 +75,13 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ lvm2 \ make \ - net-tools \ netcf-devel \ nfs-utils \ ninja-build \ @@ -112,15 +104,10 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ readline-devel \ rpm-build \ sanlock-devel \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xfsprogs-devel \ - xz \ yajl-devel && \ yum autoremove -y && \ yum clean all -y && \ diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libv= irt-centos-8.Dockerfile index 82d2970677..633a60dcd4 100644 --- a/ci/containers/libvirt-centos-8.Dockerfile +++ b/ci/containers/libvirt-centos-8.Dockerfile @@ -1,20 +1,18 @@ -FROM centos:8 +FROM registry.centos.org/centos:8 =20 RUN dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y PowerTools && \ + dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cyrus-sasl-devel \ dbus-devel \ @@ -25,9 +23,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ firewalld-filesystem \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -52,16 +48,13 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ lvm2 \ make \ - net-tools \ netcf-devel \ nfs-utils \ ninja-build \ @@ -86,15 +79,10 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ rpcgen \ rpm-build \ sanlock-devel \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xfsprogs-devel \ - xz \ yajl-devel && \ dnf autoremove -y && \ dnf clean all -y && \ diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers= /libvirt-centos-stream.Dockerfile index 12c18759f7..8256e26944 100644 --- a/ci/containers/libvirt-centos-stream.Dockerfile +++ b/ci/containers/libvirt-centos-stream.Dockerfile @@ -1,21 +1,19 @@ -FROM centos:8 +FROM registry.centos.org/centos:8 =20 RUN dnf install -y centos-release-stream && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y Stream-PowerTools && \ + dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cyrus-sasl-devel \ dbus-devel \ @@ -26,9 +24,7 @@ RUN dnf install -y centos-release-stream && \ firewalld-filesystem \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -53,16 +49,13 @@ RUN dnf install -y centos-release-stream && \ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ lvm2 \ make \ - net-tools \ netcf-devel \ nfs-utils \ ninja-build \ @@ -87,15 +80,10 @@ RUN dnf install -y centos-release-stream && \ rpcgen \ rpm-build \ sanlock-devel \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xfsprogs-devel \ - xz \ yajl-devel && \ dnf autoremove -y && \ dnf clean all -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/= containers/libvirt-debian-10-cross-aarch64.Dockerfile index 0eb01468dd..c0ccaad8f2 100644 --- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/c= ontainers/libvirt-debian-10-cross-armv6l.Dockerfile index b7f434f75f..384ced7c4b 100644 --- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/c= ontainers/libvirt-debian-10-cross-armv7l.Dockerfile index d5388bf214..026a6653b6 100644 --- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/con= tainers/libvirt-debian-10-cross-i686.Dockerfile index 24f69ac6d4..494ed5bc59 100644 --- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/con= tainers/libvirt-debian-10-cross-mips.Dockerfile index c0db737669..47d6fc627e 100644 --- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci= /containers/libvirt-debian-10-cross-mips64el.Dockerfile index d6c51f58ca..dfb2fb0342 100644 --- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/c= ontainers/libvirt-debian-10-cross-mipsel.Dockerfile index 342de4270b..13d3b7ccbd 100644 --- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/= containers/libvirt-debian-10-cross-ppc64le.Dockerfile index 037adfe4eb..b3a2c506d8 100644 --- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/co= ntainers/libvirt-debian-10-cross-s390x.Dockerfile index 60012de8f0..770f79c132 100644 --- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/lib= virt-debian-10.Dockerfile index e1d606ace5..86cca736a7 100644 --- a/ci/containers/libvirt-debian-10.Dockerfile +++ b/ci/containers/libvirt-debian-10.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:10 +FROM docker.io/library/debian:10 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ @@ -58,18 +53,14 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libssh-gcrypt-dev \ libssh2-1-dev \ libtirpc-dev \ - libtool \ - libtool-bin \ libudev-dev \ libxen-dev \ libxml2-dev \ libxml2-utils \ libyajl-dev \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -86,16 +77,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-dev \ - vim \ wireshark-dev \ xfslibs-dev \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci= /containers/libvirt-debian-sid-cross-aarch64.Dockerfile index 2efb849c7b..cf9b9114c9 100644 --- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/= containers/libvirt-debian-sid-cross-armv6l.Dockerfile index 88334eec16..407fd06372 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/= containers/libvirt-debian-sid-cross-armv7l.Dockerfile index cae9101676..924bad941f 100644 --- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/co= ntainers/libvirt-debian-sid-cross-i686.Dockerfile index 8aea704897..81fca80809 100644 --- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/c= i/containers/libvirt-debian-sid-cross-mips64el.Dockerfile index 713dc16470..20e0307b2a 100644 --- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/= containers/libvirt-debian-sid-cross-mipsel.Dockerfile index c566ab19ae..9363cdd8ba 100644 --- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci= /containers/libvirt-debian-sid-cross-ppc64le.Dockerfile index ba3ee5ad70..3e3311a43b 100644 --- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/c= ontainers/libvirt-debian-sid-cross-s390x.Dockerfile index 9ac88c469a..aa04a19a7a 100644 --- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ kmod \ libc-dev-bin \ - libtool \ - libtool-bin \ libxml2-utils \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ - vim \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/li= bvirt-debian-sid.Dockerfile index fd9b46706f..dd1c52ab47 100644 --- a/ci/containers/libvirt-debian-sid.Dockerfile +++ b/ci/containers/libvirt-debian-sid.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM docker.io/library/debian:sid =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ @@ -58,19 +53,15 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libssh-gcrypt-dev \ libssh2-1-dev \ libtirpc-dev \ - libtool \ - libtool-bin \ libudev-dev \ libxen-dev \ libxml2-dev \ libxml2-utils \ libyajl-dev \ locales \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -87,16 +78,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-dev \ - vim \ wireshark-dev \ xfslibs-dev \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/lib= virt-fedora-32.Dockerfile index 9b10864d72..88c181a746 100644 --- a/ci/containers/libvirt-fedora-32.Dockerfile +++ b/ci/containers/libvirt-fedora-32.Dockerfile @@ -1,17 +1,14 @@ -FROM fedora:32 +FROM registry.fedoraproject.org/fedora:32 =20 RUN dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cppi \ cyrus-sasl-devel \ @@ -23,9 +20,7 @@ RUN dnf update -y && \ firewalld-filesystem \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -50,17 +45,14 @@ RUN dnf update -y && \ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ lvm2 \ make \ meson \ - net-tools \ netcf-devel \ nfs-utils \ ninja-build \ @@ -85,17 +77,12 @@ RUN dnf update -y && \ rpcgen \ rpm-build \ sanlock-devel \ - screen \ scrub \ sheepdog \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xen-devel \ xfsprogs-devel \ - xz \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/lib= virt-fedora-33.Dockerfile similarity index 88% rename from ci/containers/libvirt-fedora-31.Dockerfile rename to ci/containers/libvirt-fedora-33.Dockerfile index 6fb77dddc7..25aaf0567f 100644 --- a/ci/containers/libvirt-fedora-31.Dockerfile +++ b/ci/containers/libvirt-fedora-33.Dockerfile @@ -1,17 +1,14 @@ -FROM fedora:31 +FROM fedora:33 =20 RUN dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cppi \ cyrus-sasl-devel \ @@ -23,9 +20,7 @@ RUN dnf update -y && \ firewalld-filesystem \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -50,16 +45,14 @@ RUN dnf update -y && \ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ lvm2 \ make \ - net-tools \ + meson \ netcf-devel \ nfs-utils \ ninja-build \ @@ -84,17 +77,12 @@ RUN dnf update -y && \ rpcgen \ rpm-build \ sanlock-devel \ - screen \ scrub \ sheepdog \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xen-devel \ xfsprogs-devel \ - xz \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ @@ -103,9 +91,6 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin= /gcc) =20 -RUN pip3 install \ - meson=3D=3D0.54.0 - ENV LANG "en_US.UTF-8" =20 ENV MAKE "/usr/bin/make" diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile = b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile index f65bdc13bb..faa1550859 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile @@ -1,16 +1,13 @@ -FROM fedora:rawhide +FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ augeas \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cppi \ dnsmasq \ @@ -18,23 +15,18 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ebtables \ firewalld-filesystem \ gcc \ - gdb \ - gettext-devel \ git \ glibc-langpack-en \ iproute \ iproute-tc \ iscsi-initiator-utils \ kmod \ - libtool \ libwsman-devel \ libxml2 \ libxslt \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-utils \ ninja-build \ numad \ @@ -53,13 +45,8 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ radvd \ rpcgen \ rpm-build \ - screen \ scrub \ sheepdog \ - strace \ - sudo \ - vim \ - xz \ zfs-fuse && \ dnf autoremove -y && \ dnf clean all -y && \ diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile = b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile index e460123aa5..7def8fd890 100644 --- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile @@ -1,16 +1,13 @@ -FROM fedora:rawhide +FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ augeas \ - autoconf \ - automake \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cppi \ dnsmasq \ @@ -18,23 +15,18 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ ebtables \ firewalld-filesystem \ gcc \ - gdb \ - gettext-devel \ git \ glibc-langpack-en \ iproute \ iproute-tc \ iscsi-initiator-utils \ kmod \ - libtool \ libwsman-devel \ libxml2 \ libxslt \ - lsof \ lvm2 \ make \ meson \ - net-tools \ nfs-utils \ ninja-build \ numad \ @@ -53,13 +45,8 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ radvd \ rpcgen \ rpm-build \ - screen \ scrub \ sheepdog \ - strace \ - sudo \ - vim \ - xz \ zfs-fuse && \ dnf autoremove -y && \ dnf clean all -y && \ diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/container= s/libvirt-fedora-rawhide.Dockerfile index 3a995b3c68..31219df996 100644 --- a/ci/containers/libvirt-fedora-rawhide.Dockerfile +++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile @@ -1,18 +1,15 @@ -FROM fedora:rawhide +FROM registry.fedoraproject.org/fedora:rawhide =20 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cppi \ cyrus-sasl-devel \ @@ -24,9 +21,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ firewalld-filesystem \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -51,17 +46,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ - lsof \ lvm2 \ make \ meson \ - net-tools \ netcf-devel \ nfs-utils \ ninja-build \ @@ -86,17 +78,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ rpcgen \ rpm-build \ sanlock-devel \ - screen \ scrub \ sheepdog \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xen-devel \ xfsprogs-devel \ - xz \ yajl-devel \ zfs-fuse && \ dnf autoremove -y && \ diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/= libvirt-opensuse-151.Dockerfile index 7332b1f9fb..030581d7ec 100644 --- a/ci/containers/libvirt-opensuse-151.Dockerfile +++ b/ci/containers/libvirt-opensuse-151.Dockerfile @@ -1,18 +1,15 @@ -FROM opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.1 =20 RUN zypper update -y && \ zypper install -y \ audit-devel \ augeas \ augeas-lenses \ - autoconf \ - automake \ avahi-devel \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cppi \ cyrus-sasl-devel \ @@ -23,9 +20,7 @@ RUN zypper update -y && \ ebtables \ fuse-devel \ gcc \ - gdb \ gettext \ - gettext-devel \ git \ glib2-devel \ glibc-devel \ @@ -50,17 +45,14 @@ RUN zypper update -y && \ libssh-devel \ libssh2-devel \ libtirpc-devel \ - libtool \ libudev-devel \ libwsman-devel \ libxml2 \ libxml2-devel \ libxslt \ libyajl-devel \ - lsof \ lvm2 \ make \ - net-tools \ nfs-utils \ ninja \ numad \ @@ -84,16 +76,11 @@ RUN zypper update -y && \ rpcgen \ rpm-build \ sanlock-devel \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-devel \ - vim \ wireshark-devel \ xen-devel \ - xfsprogs-devel \ - xz && \ + xfsprogs-devel && \ zypper clean --all && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/l= ibvirt-ubuntu-1804.Dockerfile index 83ac7ea6ad..daa406c2f3 100644 --- a/ci/containers/libvirt-ubuntu-1804.Dockerfile +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM docker.io/library/ubuntu:18.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ glusterfs-common \ @@ -59,18 +54,14 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libssh-dev \ libssh2-1-dev \ libtirpc-dev \ - libtool \ - libtool-bin \ libudev-dev \ libxen-dev \ libxml2-dev \ libxml2-utils \ libyajl-dev \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -87,17 +78,12 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ sheepdog \ - strace \ - sudo \ systemtap-sdt-dev \ - vim \ wireshark-dev \ xfslibs-dev \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/l= ibvirt-ubuntu-2004.Dockerfile index 09b213c8ba..dacf7429ff 100644 --- a/ci/containers/libvirt-ubuntu-2004.Dockerfile +++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM docker.io/library/ubuntu:20.04 =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get update && \ @@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ clang \ cpanminus \ dnsmasq-base \ @@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ebtables \ flake8 \ gcc \ - gdb \ gettext \ git \ iproute2 \ @@ -59,18 +54,14 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libssh-dev \ libssh2-1-dev \ libtirpc-dev \ - libtool \ - libtool-bin \ libudev-dev \ libxen-dev \ libxml2-dev \ libxml2-utils \ libyajl-dev \ locales \ - lsof \ lvm2 \ make \ - net-tools \ nfs-common \ ninja-build \ numad \ @@ -87,16 +78,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ python3-wheel \ qemu-utils \ radvd \ - screen \ scrub \ - strace \ - sudo \ systemtap-sdt-dev \ - vim \ wireshark-dev \ xfslibs-dev \ xsltproc \ - xz-utils \ zfs-fuse && \ apt-get autoremove -y && \ apt-get autoclean -y && \ --=20 2.28.0 From nobody Thu May 16 04:16:00 2024 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 Reviewed-by: Erik Skultety --- 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 From nobody Thu May 16 04:16:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1606836434; cv=none; d=zohomail.com; s=zohoarc; b=l5uiYG4muN0C69qk3noxZD2qgmlrwnZbV808VXi6gmkq40XVYSmTLvgwot8cRgP9rLYQ/S7+6y08k+ReQ2vH8Y6qsEg5VCeVmFpw/p0MMo27JsGMwoT5fMSuhwXcMUg/H001qJmfWW0Cmi7sir1bLpT2MCNEfHp98dulLPWY6hM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606836434; 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=WjIHly5UbV0tBfRctwyd9l1Zr6pISEhhga2/QAW28LQ=; b=Bu+pQQZ18KizaTFiMGDVB2+txV2U1ofuYiibKkef/8DjuYmTLNw3+rEwFPzUevAfHyzliC+j1ttGZTfDfuT9uCFxTVyy0hboTNuO6U1f/15odSBWHeljcIcDZQ65V+8NYC2+onJmZrnHNgKpWUxjMuqncQr1/T/6jcLCXqqG3hA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606836434744854.8826301892793; Tue, 1 Dec 2020 07:27:14 -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-240-rnAkb6IkNSSbxec6yC6yAA-1; Tue, 01 Dec 2020 10:27:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F22378042A6; Tue, 1 Dec 2020 15:27:04 +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 B6A705C232; Tue, 1 Dec 2020 15:27:04 +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 39A404EE7F; Tue, 1 Dec 2020 15:27:04 +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 0B1FR3VM021463 for ; Tue, 1 Dec 2020 10:27:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5F6815D9E3; Tue, 1 Dec 2020 15:27:03 +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 E74AD5D9CA; Tue, 1 Dec 2020 15:26:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606836433; 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=WjIHly5UbV0tBfRctwyd9l1Zr6pISEhhga2/QAW28LQ=; b=NznXbDsvx13DE9+UZtXzx4kqFwxYJsUTD7ksin0/C/AR7atH3GXA9c7FPNYXWF3J0sNBUZ IqhoK6y1VpUn2q1DCHFUEukAwGhexGMo+rF7ubTgiK9fh1G2QhOHnNcQQO65xGJbkIaG0C PfFJNLxU0Nx/tMNAD7BkfzO+sfDLgQE= X-MC-Unique: rnAkb6IkNSSbxec6yC6yAA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] ci: replace "libvirt-" prefix with "ci-" in dockerfiles Date: Tue, 1 Dec 2020 15:26:49 +0000 Message-Id: <20201201152649.2230442-4-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.16 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) This makes the dockerfile name match the output container name Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Erik Skultety --- .gitlab-ci.yml | 2 +- ...-centos-7.Dockerfile =3D> ci-centos-7.Dockerfile} | 0 ...-centos-8.Dockerfile =3D> ci-centos-8.Dockerfile} | 0 ...ream.Dockerfile =3D> ci-centos-stream.Dockerfile} | 0 ...rfile =3D> ci-debian-10-cross-aarch64.Dockerfile} | 0 ...erfile =3D> ci-debian-10-cross-armv6l.Dockerfile} | 0 ...erfile =3D> ci-debian-10-cross-armv7l.Dockerfile} | 0 ...ckerfile =3D> ci-debian-10-cross-i686.Dockerfile} | 0 ...ckerfile =3D> ci-debian-10-cross-mips.Dockerfile} | 0 ...file =3D> ci-debian-10-cross-mips64el.Dockerfile} | 0 ...erfile =3D> ci-debian-10-cross-mipsel.Dockerfile} | 0 ...rfile =3D> ci-debian-10-cross-ppc64le.Dockerfile} | 0 ...kerfile =3D> ci-debian-10-cross-s390x.Dockerfile} | 0 ...ebian-10.Dockerfile =3D> ci-debian-10.Dockerfile} | 0 ...file =3D> ci-debian-sid-cross-aarch64.Dockerfile} | 0 ...rfile =3D> ci-debian-sid-cross-armv6l.Dockerfile} | 0 ...rfile =3D> ci-debian-sid-cross-armv7l.Dockerfile} | 0 ...kerfile =3D> ci-debian-sid-cross-i686.Dockerfile} | 0 ...ile =3D> ci-debian-sid-cross-mips64el.Dockerfile} | 0 ...rfile =3D> ci-debian-sid-cross-mipsel.Dockerfile} | 0 ...file =3D> ci-debian-sid-cross-ppc64le.Dockerfile} | 0 ...erfile =3D> ci-debian-sid-cross-s390x.Dockerfile} | 0 ...ian-sid.Dockerfile =3D> ci-debian-sid.Dockerfile} | 0 ...edora-32.Dockerfile =3D> ci-fedora-32.Dockerfile} | 0 ...edora-33.Dockerfile =3D> ci-fedora-33.Dockerfile} | 0 ... =3D> ci-fedora-rawhide-cross-mingw32.Dockerfile} | 0 ... =3D> ci-fedora-rawhide-cross-mingw64.Dockerfile} | 0 ...ide.Dockerfile =3D> ci-fedora-rawhide.Dockerfile} | 0 ...e-151.Dockerfile =3D> ci-opensuse-151.Dockerfile} | 0 ...u-1804.Dockerfile =3D> ci-ubuntu-1804.Dockerfile} | 0 ...u-2004.Dockerfile =3D> ci-ubuntu-2004.Dockerfile} | 0 ci/containers/refresh | 14 +++++++------- 32 files changed, 8 insertions(+), 8 deletions(-) rename ci/containers/{libvirt-centos-7.Dockerfile =3D> ci-centos-7.Dockerf= ile} (100%) rename ci/containers/{libvirt-centos-8.Dockerfile =3D> ci-centos-8.Dockerf= ile} (100%) rename ci/containers/{libvirt-centos-stream.Dockerfile =3D> ci-centos-stre= am.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-aarch64.Dockerfile =3D> ci-d= ebian-10-cross-aarch64.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-armv6l.Dockerfile =3D> ci-de= bian-10-cross-armv6l.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-armv7l.Dockerfile =3D> ci-de= bian-10-cross-armv7l.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-i686.Dockerfile =3D> ci-debi= an-10-cross-i686.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-mips.Dockerfile =3D> ci-debi= an-10-cross-mips.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-mips64el.Dockerfile =3D> ci-= debian-10-cross-mips64el.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-mipsel.Dockerfile =3D> ci-de= bian-10-cross-mipsel.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-ppc64le.Dockerfile =3D> ci-d= ebian-10-cross-ppc64le.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10-cross-s390x.Dockerfile =3D> ci-deb= ian-10-cross-s390x.Dockerfile} (100%) rename ci/containers/{libvirt-debian-10.Dockerfile =3D> ci-debian-10.Docke= rfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-aarch64.Dockerfile =3D> ci-= debian-sid-cross-aarch64.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-armv6l.Dockerfile =3D> ci-d= ebian-sid-cross-armv6l.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-armv7l.Dockerfile =3D> ci-d= ebian-sid-cross-armv7l.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-i686.Dockerfile =3D> ci-deb= ian-sid-cross-i686.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-mips64el.Dockerfile =3D> ci= -debian-sid-cross-mips64el.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-mipsel.Dockerfile =3D> ci-d= ebian-sid-cross-mipsel.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-ppc64le.Dockerfile =3D> ci-= debian-sid-cross-ppc64le.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid-cross-s390x.Dockerfile =3D> ci-de= bian-sid-cross-s390x.Dockerfile} (100%) rename ci/containers/{libvirt-debian-sid.Dockerfile =3D> ci-debian-sid.Doc= kerfile} (100%) rename ci/containers/{libvirt-fedora-32.Dockerfile =3D> ci-fedora-32.Docke= rfile} (100%) rename ci/containers/{libvirt-fedora-33.Dockerfile =3D> ci-fedora-33.Docke= rfile} (100%) rename ci/containers/{libvirt-fedora-rawhide-cross-mingw32.Dockerfile =3D>= ci-fedora-rawhide-cross-mingw32.Dockerfile} (100%) rename ci/containers/{libvirt-fedora-rawhide-cross-mingw64.Dockerfile =3D>= ci-fedora-rawhide-cross-mingw64.Dockerfile} (100%) rename ci/containers/{libvirt-fedora-rawhide.Dockerfile =3D> ci-fedora-raw= hide.Dockerfile} (100%) rename ci/containers/{libvirt-opensuse-151.Dockerfile =3D> ci-opensuse-151= .Dockerfile} (100%) rename ci/containers/{libvirt-ubuntu-1804.Dockerfile =3D> ci-ubuntu-1804.D= ockerfile} (100%) rename ci/containers/{libvirt-ubuntu-2004.Dockerfile =3D> ci-ubuntu-2004.D= ockerfile} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4f6aa8ee9..e2d5545f0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ stages: - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/containers/libvirt-$NAME.Dockerfile" ci/containers + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/containers/ci-$NAME.Dockerfile" ci/containers - docker push "$TAG" after_script: - docker logout diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/ci-c= entos-7.Dockerfile similarity index 100% rename from ci/containers/libvirt-centos-7.Dockerfile rename to ci/containers/ci-centos-7.Dockerfile diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/ci-c= entos-8.Dockerfile similarity index 100% rename from ci/containers/libvirt-centos-8.Dockerfile rename to ci/containers/ci-centos-8.Dockerfile diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers= /ci-centos-stream.Dockerfile similarity index 100% rename from ci/containers/libvirt-centos-stream.Dockerfile rename to ci/containers/ci-centos-stream.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/= containers/ci-debian-10-cross-aarch64.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile rename to ci/containers/ci-debian-10-cross-aarch64.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/c= ontainers/ci-debian-10-cross-armv6l.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile rename to ci/containers/ci-debian-10-cross-armv6l.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/c= ontainers/ci-debian-10-cross-armv7l.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile rename to ci/containers/ci-debian-10-cross-armv7l.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/con= tainers/ci-debian-10-cross-i686.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-i686.Dockerfile rename to ci/containers/ci-debian-10-cross-i686.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/con= tainers/ci-debian-10-cross-mips.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-mips.Dockerfile rename to ci/containers/ci-debian-10-cross-mips.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci= /containers/ci-debian-10-cross-mips64el.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile rename to ci/containers/ci-debian-10-cross-mips64el.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/c= ontainers/ci-debian-10-cross-mipsel.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile rename to ci/containers/ci-debian-10-cross-mipsel.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/= containers/ci-debian-10-cross-ppc64le.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile rename to ci/containers/ci-debian-10-cross-ppc64le.Dockerfile diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/co= ntainers/ci-debian-10-cross-s390x.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10-cross-s390x.Dockerfile rename to ci/containers/ci-debian-10-cross-s390x.Dockerfile diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/ci-= debian-10.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-10.Dockerfile rename to ci/containers/ci-debian-10.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci= /containers/ci-debian-sid-cross-aarch64.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile rename to ci/containers/ci-debian-sid-cross-aarch64.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/= containers/ci-debian-sid-cross-armv6l.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile rename to ci/containers/ci-debian-sid-cross-armv6l.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/= containers/ci-debian-sid-cross-armv7l.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile rename to ci/containers/ci-debian-sid-cross-armv7l.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/co= ntainers/ci-debian-sid-cross-i686.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-i686.Dockerfile rename to ci/containers/ci-debian-sid-cross-i686.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/c= i/containers/ci-debian-sid-cross-mips64el.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile rename to ci/containers/ci-debian-sid-cross-mips64el.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/= containers/ci-debian-sid-cross-mipsel.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile rename to ci/containers/ci-debian-sid-cross-mipsel.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci= /containers/ci-debian-sid-cross-ppc64le.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile rename to ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/c= ontainers/ci-debian-sid-cross-s390x.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile rename to ci/containers/ci-debian-sid-cross-s390x.Dockerfile diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/ci= -debian-sid.Dockerfile similarity index 100% rename from ci/containers/libvirt-debian-sid.Dockerfile rename to ci/containers/ci-debian-sid.Dockerfile diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/ci-= fedora-32.Dockerfile similarity index 100% rename from ci/containers/libvirt-fedora-32.Dockerfile rename to ci/containers/ci-fedora-32.Dockerfile diff --git a/ci/containers/libvirt-fedora-33.Dockerfile b/ci/containers/ci-= fedora-33.Dockerfile similarity index 100% rename from ci/containers/libvirt-fedora-33.Dockerfile rename to ci/containers/ci-fedora-33.Dockerfile diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile = b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile similarity index 100% rename from ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile rename to ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile = b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile similarity index 100% rename from ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile rename to ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/container= s/ci-fedora-rawhide.Dockerfile similarity index 100% rename from ci/containers/libvirt-fedora-rawhide.Dockerfile rename to ci/containers/ci-fedora-rawhide.Dockerfile diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/= ci-opensuse-151.Dockerfile similarity index 100% rename from ci/containers/libvirt-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-151.Dockerfile diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/c= i-ubuntu-1804.Dockerfile similarity index 100% rename from ci/containers/libvirt-ubuntu-1804.Dockerfile rename to ci/containers/ci-ubuntu-1804.Dockerfile diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/c= i-ubuntu-2004.Dockerfile similarity index 100% rename from ci/containers/libvirt-ubuntu-2004.Dockerfile rename to ci/containers/ci-ubuntu-2004.Dockerfile diff --git a/ci/containers/refresh b/ci/containers/refresh index 4cae30b869..a39d0b0996 100755 --- a/ci/containers/refresh +++ b/ci/containers/refresh @@ -19,24 +19,24 @@ HOSTS=3D$($LCITOOL hosts | grep -Ev 'freebsd|macos') for host in $HOSTS do case "$host" in - libvirt-fedora-rawhide) + fedora-rawhide) for cross in mingw32 mingw64 do - $LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-= $cross.Dockerfile + $LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cr= oss-$cross.Dockerfile done ;; - libvirt-debian-*) + debian-*) for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64= le s390x do - if test "$host-cross-$cross" =3D "libvirt-debian-9-cross-i686"= || - test "$host-cross-$cross" =3D "libvirt-debian-sid-cross-mip= s" + if test "$host-cross-$cross" =3D "debian-9-cross-i686" || + test "$host-cross-$cross" =3D "debian-sid-cross-mips" then continue fi - $LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-= $cross.Dockerfile + $LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cr= oss-$cross.Dockerfile done ;; esac =20 - $LCITOOL dockerfile $host libvirt >$host.Dockerfile + $LCITOOL dockerfile $host libvirt > ci-$host.Dockerfile done --=20 2.28.0