ci: Refresh Dockerfiles

All targets get cpanm, which is now part of the base system, and
xz is now installed explicitly instead of relying on it being either
present by default or dragged in indirectly.

The corresponding libvirt-ci commit is 8920e8f408ba.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile
index abbbdcc47adb5d012a36db1c7f8b3b07621632b8..08d93866443ec5d18808ce69bac3da2239627ef4 100644 (file)
--- a/ci/containers/libvirt-centos-7.Dockerfile
+++ b/ci/containers/libvirt-centos-7.Dockerfile
@@ -98,6 +98,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         parted-devel \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -118,6 +119,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         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/libvirt-centos-8.Dockerfile
index f376126d93f7ef5dcfdecfcfded50c511f3ed7a9..2ac825fc807533fd83888704f3f1e99615214cf1 100644 (file)
--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@@ -71,6 +71,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         parted-devel \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -93,6 +94,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         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 bc75c95193f2f94ed197d8d770acd41298a2cbc7..e0025e2acb23250dcd91739eed4611905e39d9fa 100644 (file)
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@@ -72,6 +72,7 @@ RUN dnf install -y centos-release-stream && \
         parted-devel \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -94,6 +95,7 @@ RUN dnf install -y centos-release-stream && \
         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 a03a7fd26ac01bb3b8a8fc6145a08d15a559ff78..2d49f5e6e77fa81183efc5f24ed6c84c4f7404af 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-10-cross-armv6l.Dockerfile
index 4f673cb3e234bc091029506d49dbaef65b33a293..f9d6ee4c9f4fe14226c3e80615fc8721cf2f5981 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-10-cross-armv7l.Dockerfile
index fa5fae4399844c3ec4d39dee4e7cb25d7f6221e6..f26e0595352a77491e234e7ef5e606ca0ef84f52 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-10-cross-i686.Dockerfile
index a3bc96ac7a4bbaffc30594b433880bdd8472b196..eaca5ee20b358cfa8c46eaf63c90ea207d263d22 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-10-cross-mips.Dockerfile
index 14844307c00a0247a26118ba4d701fd34898097f..7909471dccf6cbd34bc71c1398f90c5e4278e7a0 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 6f27e462b9bd19fccab9340457cbf2d8653dbf76..0e8bb6f4fb67bb45e4ff779c824bfd3f56a81391 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-10-cross-mipsel.Dockerfile
index 4da9d1cb6e37d58664511993a7fb864b97980632..9faf47dff10f3eb69d6bfef2bb8c388d97d69f33 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 841706bab801fbea7ced0111ae64dbc0c442d67c..68a438485d86a0cf61e1ac5957c502c0f10a672b 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-10-cross-s390x.Dockerfile
index 01a5bb5a77bf801537b058b18a0ee6081d47b292..473ad32435bc4934373893205c7cd4d5da759015 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/libvirt-debian-10.Dockerfile
index 2b1c1b985543fb85b7d353b19ff642698edf915a..e1c97f2bf0f6ac1b96ce4797db1567e55980e980 100644 (file)
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -95,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile
index 5235f6b1409e736742dd76a0338f9193e76567f0..8f7f794c9cc4efd9c5101e8085965d8fd71c96ad 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile
index 1762aa4bfeda3338762b9e204f1f2bc506a75ed7..1dcb575099b013e91e75a107d3c3bf896549b365 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile
index fb7c5c89b52097d3c9b813c416c6645f20812c31..e7016b622ea363412a94a8a82a2572e53f81d569 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-mips.Dockerfile b/ci/containers/libvirt-debian-9-cross-mips.Dockerfile
index 4426de2d1f782ad4b921b1f8f058414cacd5be49..f25dc05be463844e15a4a8a0aab791098c93dc06 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-mips.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile
index bacaac8e06ac0832bb8318168b5d8f43508796ad..810798124becb4f7151721c081cf2113ecf4f473 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile
index 5eac3f5a2504243397630a64c3f320a44e3d7727..37afc5f6a461097a2fd310013a2dc191c64b2398 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile
index b9749e1c50de42b2f329a1c51f7cb00c0b8e4e29..41f96abed12635daba0762bdf6e2baf0ee0637d8 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile
index 7f7dd6762a25dde728b57dd6e29dcefd6e52fa73..c200dc92b063cc0691ff53575f75f1a4eb92f830 100644 (file)
--- a/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             sudo \
             vim \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-9.Dockerfile b/ci/containers/libvirt-debian-9.Dockerfile
index 613604aab8b59fe589f90ad23e85792b53a19a60..0aa24b6f2c4a505586c8d887230a71502de0953f 100644 (file)
--- a/ci/containers/libvirt-debian-9.Dockerfile
+++ b/ci/containers/libvirt-debian-9.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -95,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 f573b8475a45da47a9ddd3166deb0067e5e69d8d..9aedc673305aa0fe49c059327eaac5bbef64086d 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 2a9f81a15be1356cc33c9d47fc44240d9c2d6e6a..3f5ccba66a62d1b9379947c26699dd11d3317aaf 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 3e37184069f6e16b6de68af3cf0d02f5a742f2c2..f67f13cf85be7551c2cc334c263bc6701107c36b 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-sid-cross-i686.Dockerfile
index e167a43b567d99937cca459e6599394302735729..0ed089f9ab2445c041494a2dc0b8dcc85bc8d080 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
index 57ef04771e3a5836af9dad59d7dc7636719c2a24..cdafb2aef818ccc106688286497fbd80a8d228dd 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 a174fb57fdfc2fd5f64455c0407051da01d9aff2..532b70be3bfddffb0f065aa071dd834ff9e16592 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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 d1c412c452cfb91b2d62b3e1778cbf5800aa9190..8bc32873bc6ed2c4488466bf5bcef1280cb86dcf 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/containers/libvirt-debian-sid-cross-s390x.Dockerfile
index 2dffc088953b2d1321e4de94b84a77c4331d46e8..6a98b30326b8da7386205d551948736dd8cd55e7 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -56,6 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/libvirt-debian-sid.Dockerfile
index 5b7b980419cc3d1ba235ebdaf228d695cf27c578..b8ec601ef128dff456c2c0c1dc84c0396988088f 100644 (file)
--- a/ci/containers/libvirt-debian-sid.Dockerfile
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -95,6 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile
index 06bd1435d3505ecc23247628938175e822a08723..7b492d30c05f1ca794d62ffaf0fecec108c9daae 100644 (file)
--- a/ci/containers/libvirt-fedora-31.Dockerfile
+++ b/ci/containers/libvirt-fedora-31.Dockerfile
@@ -69,6 +69,7 @@ RUN dnf update -y && \
         parted-devel \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -93,6 +94,7 @@ RUN dnf update -y && \
         wireshark-devel \
         xen-devel \
         xfsprogs-devel \
+        xz \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \

diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile
index 7b8a3fff442c0c71f599a6bed6e342c5180653e7..f208f82a2ae565f6e1824c35ffb2fe7973bca176 100644 (file)
--- a/ci/containers/libvirt-fedora-32.Dockerfile
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -69,6 +69,7 @@ RUN dnf update -y && \
         parted-devel \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -93,6 +94,7 @@ RUN dnf update -y && \
         wireshark-devel \
         xen-devel \
         xfsprogs-devel \
+        xz \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \

diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
index ac5ecc295861984228173395c97c33c92e948372..c1cce71e5f2027abdb507f31dcf73281e9dd6900 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
@@ -39,6 +39,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         parted \
         patch \
         perl \
+        perl-App-cpanminus \
         polkit \
         python3 \
         python3-docutils \
@@ -56,6 +57,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         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 e52e2fed0455076878dc69815f426fab39d6dc05..8c1829be1311660aa96309e1c2a19809ddffa914 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
@@ -39,6 +39,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         parted \
         patch \
         perl \
+        perl-App-cpanminus \
         polkit \
         python3 \
         python3-docutils \
@@ -56,6 +57,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         strace \
         sudo \
         vim \
+        xz \
         zfs-fuse && \
     dnf autoremove -y && \
     dnf clean all -y && \

diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile
index d3c97ddda0015cd66ce4698210f31ec510e0b062..8e092744f6e4306f3b9f00b80be25204b1559165 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -70,6 +70,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         parted-devel \
         patch \
         perl \
+        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -94,6 +95,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         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 d534cdc8b82670ae7fb8c5f9c05bc3557155d47c..2ba408efb74221c1bfebecca03113d475fcbd45b 100644 (file)
--- a/ci/containers/libvirt-opensuse-151.Dockerfile
+++ b/ci/containers/libvirt-opensuse-151.Dockerfile
@@ -69,6 +69,7 @@ RUN zypper update -y && \
            parted-devel \
            patch \
            perl \
+           perl-App-cpanminus \
            pkgconfig \
            polkit \
            python3 \
@@ -91,7 +92,8 @@ RUN zypper update -y && \
            vim \
            wireshark-devel \
            xen-devel \
-           xfsprogs-devel && \
+           xfsprogs-devel \
+           xz && \
     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/libvirt-ubuntu-1804.Dockerfile
index 1818bb453d7649d37b8016aaa3ea192169e31ba9..9675130770406a804da9b3a6192b5d85d314ca1d 100644 (file)
--- a/ci/containers/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -96,6 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             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/libvirt-ubuntu-2004.Dockerfile
index 855b673f87d5693747506482832c12858b741999..2457e7a8dba0386dc716b3f706cff18d84efbd11 100644 (file)
--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -14,6 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ca-certificates \
             ccache \
             chrony \
+            cpanminus \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -96,6 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
+            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \