gitlab: refresh containers with lcitool for fully minimized base

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile
index ea460f76c9a9f93bcf91ba8e761ace63a1977ea7..d94f335c9df83bcc9d843b0db72436d40632bacf 100644 (file)
--- a/ci/containers/libvirt-centos-7.Dockerfile
+++ b/ci/containers/libvirt-centos-7.Dockerfile
@@ -36,7 +36,6 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         audit-libs-devel \
         augeas \
         avahi-devel \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
@@ -44,6 +43,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         cyrus-sasl-devel \
         dbus-devel \
         device-mapper-devel \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -89,9 +89,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         numad \
         parted \
         parted-devel \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -119,9 +117,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja-build"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile
index 633a60dcd464223343f2aaeaeb28a2b6abb735a4..568e23af76321a372614a7c678a6cba90cd1fdbe 100644 (file)
--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@@ -9,7 +9,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         audit-libs-devel \
         augeas \
         avahi-devel \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
@@ -17,6 +16,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         cyrus-sasl-devel \
         dbus-devel \
         device-mapper-devel \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -62,9 +62,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         numad \
         parted \
         parted-devel \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -94,9 +92,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile
index 8256e2694478b866c3592634c836011308b8b600..f1ecab837a13d52f68d48aa4e57c332b60232a43 100644 (file)
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@@ -10,7 +10,6 @@ RUN dnf install -y centos-release-stream && \
         audit-libs-devel \
         augeas \
         avahi-devel \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
@@ -18,6 +17,7 @@ RUN dnf install -y centos-release-stream && \
         cyrus-sasl-devel \
         dbus-devel \
         device-mapper-devel \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -63,9 +63,7 @@ RUN dnf install -y centos-release-stream && \
         numad \
         parted \
         parted-devel \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
@@ -95,9 +93,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
index c0ccaad8f24452ab1f0d1064e0f330ce78e98618..1c755908f2ce5d91af3d9f0b65251a451e664b26 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -114,11 +112,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "aarch64-linux-gnu"

diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
index 384ced7c4bac6d77b8161e0c683d00fdffac6eb0..327b4f7e7e7b54c5a20346b8ecfe4b2f88637332 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "arm-linux-gnueabi"

diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
index 026a6653b6682d71453f2a45213b30bcf9fcf55d..d73de0d4d247318552eca8d0f173c95799466d7e 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -114,11 +112,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "arm-linux-gnueabihf"

diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
index 494ed5bc59b4cc23aae6cd5c84e8e41dc3c9d2a0..41922b7582ad38da2fcdd13984e335e48ebc587f 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "i686-linux-gnu"

diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
index 47d6fc627e5e54235ffd64cb9c859490ebae0d85..369a8a7e4224d1143536daff36a7c8c95a293a19 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "mips-linux-gnu"

diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
index dfb2fb0342aa6dd86c6dd4f93b2bf20c41a28386..c8f6bd818f4450b084cb3403ef36d7988c57f258 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "mips64el-linux-gnuabi64"

diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
index 13d3b7ccbd23eb56f5f599df261b75904dfe5afd..81de62b44bcaa06439878b40bed75999e77db1d9 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "mipsel-linux-gnu"

diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
index b3a2c506d89b4924764b00c625f5e82adf5a2763..c4dcd634316fd4501e61942361c8d95159af7c32 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "powerpc64le-linux-gnu"

diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
index 770f79c1326c0557f143adad5256acfe49594d48..9a5f8edbe5f411dc684356df5824eca850bbe7eb 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -31,7 +30,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -113,11 +111,9 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "s390x-linux-gnu"

diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile
index 86cca736a70c733f6128270c02dde37bec187e35..9858584b03036c9a041728cb4cbc6831e3f8eeaf 100644 (file)
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -66,7 +65,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -95,9 +93,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
index cf9b9114c91905fdcccbd34c7a6cd09d6fd943b3..dff7cb620ed6db599abd51cda61d528627c2045b 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -112,11 +107,9 @@ cpu = 'aarch64'\n\
 endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "aarch64-linux-gnu"

diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
index 407fd06372eede168cd5740a96542f7d8b63b89c..f3a168be3bcf5d4a74988507765c707281456ea8 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -111,11 +106,9 @@ cpu = 'arm'\n\
 endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "arm-linux-gnueabi"

diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
index 924bad941f96168f4d6d3842735fb4fdfbfed117..88f1033ed588916fd2d6b81442e6cdb6c9017240 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -112,11 +107,9 @@ cpu = 'armhf'\n\
 endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "arm-linux-gnueabihf"

diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
index 81fca808090c2c75746615243a94b2ec16b177f9..e34c8074d99970f3d734facfdd9720cc03b83994 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -111,11 +106,9 @@ cpu = 'i686'\n\
 endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "i686-linux-gnu"

diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
index 20e0307b2a5d381c358234df26a1efb009cc801f..eaf1bf56410bdfaa2280cbd127b83e1374a0dac8 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -111,11 +106,9 @@ cpu = 'mips64el'\n\
 endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "mips64el-linux-gnuabi64"

diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
index 9363cdd8ba717f89ce0419dc3a1cff4621a8b91d..424f97315d5200846b7198de49314abf3350626e 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -111,11 +106,9 @@ cpu = 'mipsel'\n\
 endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "mipsel-linux-gnu"

diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
index 3e3311a43bcb02f6458700089b43fe5d5cecc0b4..311106e3378ff1fcefe01aba067c2dd13ad3ab07 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -111,11 +106,9 @@ cpu = 'powerpc64le'\n\
 endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "powerpc64le-linux-gnu"

diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
index aa04a19a7ab950aedac8a24210315f65c5af2cb8..ee188c0a20a4e6b34ebaf6d46996181898f04edd 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -32,15 +31,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -111,11 +106,9 @@ cpu = 's390x'\n\
 endian = 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "s390x-linux-gnu"

diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile
index dd1c52ab474cd3ed1dcde10c1aa429c5c84a8a3d..d914d5d6c222136e0d1136e0d68f81ba8491bff7 100644 (file)
--- a/ci/containers/libvirt-debian-sid.Dockerfile
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -67,15 +66,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
             python3 \
             python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
             qemu-utils \
             radvd \
             scrub \
@@ -93,9 +88,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile
index 88c181a7460ced22570a84ec1455b762781b3963..8be1754ac5236671cd90ae202c466476a2e3c265 100644 (file)
--- a/ci/containers/libvirt-fedora-32.Dockerfile
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -5,7 +5,6 @@ RUN dnf update -y && \
         audit-libs-devel \
         augeas \
         avahi-devel \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
@@ -14,6 +13,7 @@ RUN dnf update -y && \
         cyrus-sasl-devel \
         dbus-devel \
         device-mapper-devel \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -60,17 +60,12 @@ RUN dnf update -y && \
         numad \
         parted \
         parted-devel \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
         python3-docutils \
         python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
         qemu-img \
         radvd \
         readline-devel \
@@ -92,9 +87,7 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-fedora-33.Dockerfile b/ci/containers/libvirt-fedora-33.Dockerfile
index 3e4eb21130c273d8f881540fd1d697ec687d0cb9..ef326280694027a4032492bd6f42f2f9a976cdad 100644 (file)
--- a/ci/containers/libvirt-fedora-33.Dockerfile
+++ b/ci/containers/libvirt-fedora-33.Dockerfile
@@ -5,7 +5,6 @@ RUN dnf update -y && \
         audit-libs-devel \
         augeas \
         avahi-devel \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
@@ -14,6 +13,7 @@ RUN dnf update -y && \
         cyrus-sasl-devel \
         dbus-devel \
         device-mapper-devel \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -60,17 +60,12 @@ RUN dnf update -y && \
         numad \
         parted \
         parted-devel \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
         python3-docutils \
         python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
         qemu-img \
         radvd \
         readline-devel \
@@ -92,9 +87,7 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
index faa155085970d5c50f5891b11e615312150360dd..32527e8e56ddba410dd9f021fcf05db4949e13ff 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
@@ -4,12 +4,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     dnf update -y && \
     dnf install -y \
         augeas \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
         clang \
         cppi \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -31,16 +31,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         ninja-build \
         numad \
         parted \
-        patch \
         perl \
-        perl-App-cpanminus \
         polkit \
         python3 \
         python3-docutils \
         python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
         qemu-img \
         radvd \
         rpcgen \
@@ -71,11 +66,9 @@ RUN dnf install -y \
     dnf clean all -y
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "i686-w64-mingw32"

diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
index 7def8fd890338ef84f42e900f864dd90ec812667..e82de31df9de959944bc2fd5da7d33504d7fd831 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
@@ -4,12 +4,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     dnf update -y && \
     dnf install -y \
         augeas \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
         clang \
         cppi \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -31,16 +31,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         ninja-build \
         numad \
         parted \
-        patch \
         perl \
-        perl-App-cpanminus \
         polkit \
         python3 \
         python3-docutils \
         python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
         qemu-img \
         radvd \
         rpcgen \
@@ -71,11 +66,9 @@ RUN dnf install -y \
     dnf clean all -y
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
 ENV ABI "x86_64-w64-mingw32"

diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile
index 31219df996100d14ef9961acde390cadedb382e4..ee2f0fcfc1f5135a2385007c52ecc0ca9b442b2f 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -6,7 +6,6 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         audit-libs-devel \
         augeas \
         avahi-devel \
-        bash \
         bash-completion \
         ca-certificates \
         ccache \
@@ -15,6 +14,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         cyrus-sasl-devel \
         dbus-devel \
         device-mapper-devel \
+        diffutils \
         dnsmasq \
         dwarves \
         ebtables \
@@ -61,17 +61,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         numad \
         parted \
         parted-devel \
-        patch \
         perl \
-        perl-App-cpanminus \
         pkgconfig \
         polkit \
         python3 \
         python3-docutils \
         python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
         qemu-img \
         radvd \
         readline-devel \
@@ -93,9 +88,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile
index 030581d7ecb5b95bef637b65aa7d8c11a16c1a3b..c2d088f004a72d01f624e6ba5490146ff1c7954c 100644 (file)
--- a/ci/containers/libvirt-opensuse-151.Dockerfile
+++ b/ci/containers/libvirt-opensuse-151.Dockerfile
@@ -6,7 +6,6 @@ RUN zypper update -y && \
            augeas \
            augeas-lenses \
            avahi-devel \
-           bash \
            bash-completion \
            ca-certificates \
            ccache \
@@ -15,6 +14,7 @@ RUN zypper update -y && \
            cyrus-sasl-devel \
            dbus-1-devel \
            device-mapper-devel \
+           diffutils \
            dnsmasq \
            dwarves \
            ebtables \
@@ -59,9 +59,7 @@ RUN zypper update -y && \
            open-iscsi \
            parted \
            parted-devel \
-           patch \
            perl \
-           perl-App-cpanminus \
            pkgconfig \
            polkit \
            python3 \
@@ -90,9 +88,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile
index daa406c2f360ca8d0323c84dec7dadd9e1e4edbd..3a5362e128d7b74d22424b7db3a9b66a5beb105b 100644 (file)
--- a/ci/containers/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -67,7 +66,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -97,9 +95,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile
index dacf7429ff30401bf86542e9aa2585b326f06113..41a3f5995e3e270a04125756a94c121fe358be93 100644 (file)
--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -6,12 +6,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            bash \
             bash-completion \
             ca-certificates \
             ccache \
             clang \
-            cpanminus \
+            diffutils \
             dnsmasq-base \
             dwarves \
             ebtables \
@@ -67,7 +66,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             numad \
             open-iscsi \
             parted \
-            patch \
             perl \
             pkgconf \
             policykit-1 \
@@ -96,9 +94,7 @@ RUN pip3 install \
          meson==0.54.0
 
 ENV LANG "en_US.UTF-8"
-
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"