[libvirt PATCH 1/4] ci: refresh Dockerfiles

Ján Tomko jtomko at redhat.com
Tue Jul 28 23:36:11 UTC 2020 

We dropped ncurses and added libnuma-dev on all debian archs
as of libvirt-ci commit:

commit 4717287565d81b747d3176332108fe0302de2669
    projects: libvirt doesn't depend on ncurses

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 ci/containers/libvirt-centos-7.Dockerfile                  | 1 -
 ci/containers/libvirt-centos-8.Dockerfile                  | 1 -
 ci/containers/libvirt-centos-stream.Dockerfile             | 1 -
 ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile   | 1 -
 ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile    | 2 +-
 ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile    | 2 +-
 ci/containers/libvirt-debian-10-cross-i686.Dockerfile      | 1 -
 ci/containers/libvirt-debian-10-cross-mips.Dockerfile      | 1 -
 ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile  | 1 -
 ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile    | 1 -
 ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile   | 1 -
 ci/containers/libvirt-debian-10-cross-s390x.Dockerfile     | 1 -
 ci/containers/libvirt-debian-10.Dockerfile                 | 1 -
 ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile  | 1 -
 ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile   | 2 +-
 ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile   | 2 +-
 ci/containers/libvirt-debian-sid-cross-i686.Dockerfile     | 1 -
 ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile | 1 -
 ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile   | 2 +-
 ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile  | 1 -
 ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile    | 1 -
 ci/containers/libvirt-debian-sid.Dockerfile                | 1 -
 ci/containers/libvirt-fedora-31.Dockerfile                 | 1 -
 ci/containers/libvirt-fedora-32.Dockerfile                 | 1 -
 ci/containers/libvirt-fedora-rawhide.Dockerfile            | 1 -
 ci/containers/libvirt-opensuse-151.Dockerfile              | 1 -
 ci/containers/libvirt-ubuntu-1804.Dockerfile               | 1 -
 ci/containers/libvirt-ubuntu-2004.Dockerfile               | 1 -
 28 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile
index 08d9386644..0054587542 100644
--- a/ci/containers/libvirt-centos-7.Dockerfile
+++ b/ci/containers/libvirt-centos-7.Dockerfile
@@ -87,7 +87,6 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         lsof \
         lvm2 \
         make \
-        ncurses-devel \
         net-tools \
         netcf-devel \
         nfs-utils \
diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile
index 2ac825fc80..b5ce6fa2db 100644
--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@@ -60,7 +60,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         lvm2 \
         make \
         meson \
-        ncurses-devel \
         net-tools \
         netcf-devel \
         nfs-utils \
diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile
index e0025e2acb..8f8e089a25 100644
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@@ -61,7 +61,6 @@ RUN dnf install -y centos-release-stream && \
         lvm2 \
         make \
         meson \
-        ncurses-devel \
         net-tools \
         netcf-devel \
         nfs-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
index 2d49f5e6e7..3013c4316d 100644
--- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:arm64 \
             libgnutls28-dev:arm64 \
             libiscsi-dev:arm64 \
-            libncurses-dev:arm64 \
             libnl-3-dev:arm64 \
             libnl-route-3-dev:arm64 \
             libnuma-dev:arm64 \
diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
index f9d6ee4c9f..adc3ff345c 100644
--- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
@@ -90,9 +90,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:armel \
             libgnutls28-dev:armel \
             libiscsi-dev:armel \
-            libncurses-dev:armel \
             libnl-3-dev:armel \
             libnl-route-3-dev:armel \
+            libnuma-dev:armel \
             libparted-dev:armel \
             libpcap0.8-dev:armel \
             libpciaccess-dev:armel \
diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
index f26e059535..f1fa703fef 100644
--- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
@@ -90,9 +90,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:armhf \
             libgnutls28-dev:armhf \
             libiscsi-dev:armhf \
-            libncurses-dev:armhf \
             libnl-3-dev:armhf \
             libnl-route-3-dev:armhf \
+            libnuma-dev:armhf \
             libparted-dev:armhf \
             libpcap0.8-dev:armhf \
             libpciaccess-dev:armhf \
diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
index eaca5ee20b..81df3b1b09 100644
--- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:i386 \
             libgnutls28-dev:i386 \
             libiscsi-dev:i386 \
-            libncurses-dev:i386 \
             libnl-3-dev:i386 \
             libnl-route-3-dev:i386 \
             libnuma-dev:i386 \
diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
index 7909471dcc..3cf42d1573 100644
--- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:mips \
             libgnutls28-dev:mips \
             libiscsi-dev:mips \
-            libncurses-dev:mips \
             libnl-3-dev:mips \
             libnl-route-3-dev:mips \
             libnuma-dev:mips \
diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
index 0e8bb6f4fb..7cbd99800c 100644
--- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:mips64el \
             libgnutls28-dev:mips64el \
             libiscsi-dev:mips64el \
-            libncurses-dev:mips64el \
             libnl-3-dev:mips64el \
             libnl-route-3-dev:mips64el \
             libnuma-dev:mips64el \
diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
index 9faf47dff1..609f3942ab 100644
--- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:mipsel \
             libgnutls28-dev:mipsel \
             libiscsi-dev:mipsel \
-            libncurses-dev:mipsel \
             libnl-3-dev:mipsel \
             libnl-route-3-dev:mipsel \
             libnuma-dev:mipsel \
diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
index 68a438485d..f1c8bbd954 100644
--- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:ppc64el \
             libgnutls28-dev:ppc64el \
             libiscsi-dev:ppc64el \
-            libncurses-dev:ppc64el \
             libnl-3-dev:ppc64el \
             libnl-route-3-dev:ppc64el \
             libnuma-dev:ppc64el \
diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
index 473ad32435..ddbab67dce 100644
--- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:s390x \
             libgnutls28-dev:s390x \
             libiscsi-dev:s390x \
-            libncurses-dev:s390x \
             libnl-3-dev:s390x \
             libnl-route-3-dev:s390x \
             libnuma-dev:s390x \
diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile
index e1c97f2bf0..1e9a434aca 100644
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev \
             libgnutls28-dev \
             libiscsi-dev \
-            libncurses-dev \
             libnetcf-dev \
             libnl-3-dev \
             libnl-route-3-dev \
diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
index 9aedc67330..fb22273c87 100644
--- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:arm64 \
             libgnutls28-dev:arm64 \
             libiscsi-dev:arm64 \
-            libncurses-dev:arm64 \
             libnl-3-dev:arm64 \
             libnl-route-3-dev:arm64 \
             libnuma-dev:arm64 \
diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
index 3f5ccba66a..e083fc7225 100644
--- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
@@ -90,9 +90,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:armel \
             libgnutls28-dev:armel \
             libiscsi-dev:armel \
-            libncurses-dev:armel \
             libnl-3-dev:armel \
             libnl-route-3-dev:armel \
+            libnuma-dev:armel \
             libparted-dev:armel \
             libpcap0.8-dev:armel \
             libpciaccess-dev:armel \
diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
index f67f13cf85..b21af56204 100644
--- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
@@ -90,9 +90,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:armhf \
             libgnutls28-dev:armhf \
             libiscsi-dev:armhf \
-            libncurses-dev:armhf \
             libnl-3-dev:armhf \
             libnl-route-3-dev:armhf \
+            libnuma-dev:armhf \
             libparted-dev:armhf \
             libpcap0.8-dev:armhf \
             libpciaccess-dev:armhf \
diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
index 0ed089f9ab..e18d6ce297 100644
--- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:i386 \
             libgnutls28-dev:i386 \
             libiscsi-dev:i386 \
-            libncurses-dev:i386 \
             libnl-3-dev:i386 \
             libnl-route-3-dev:i386 \
             libnuma-dev:i386 \
diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
index cdafb2aef8..be51a11a3f 100644
--- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:mips64el \
             libgnutls28-dev:mips64el \
             libiscsi-dev:mips64el \
-            libncurses-dev:mips64el \
             libnl-3-dev:mips64el \
             libnl-route-3-dev:mips64el \
             libnuma-dev:mips64el \
diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
index 532b70be3b..5d818ff05e 100644
--- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
@@ -90,13 +90,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:mipsel \
             libgnutls28-dev:mipsel \
             libiscsi-dev:mipsel \
-            libncurses-dev:mipsel \
             libnl-3-dev:mipsel \
             libnl-route-3-dev:mipsel \
             libnuma-dev:mipsel \
             libparted-dev:mipsel \
             libpcap0.8-dev:mipsel \
             libpciaccess-dev:mipsel \
+            librbd-dev:mipsel \
             libreadline-dev:mipsel \
             libsanlock-dev:mipsel \
             libsasl2-dev:mipsel \
diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
index 8bc32873bc..ac103235a5 100644
--- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:ppc64el \
             libgnutls28-dev:ppc64el \
             libiscsi-dev:ppc64el \
-            libncurses-dev:ppc64el \
             libnl-3-dev:ppc64el \
             libnl-route-3-dev:ppc64el \
             libnuma-dev:ppc64el \
diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
index 6a98b30326..b77ce2945c 100644
--- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev:s390x \
             libgnutls28-dev:s390x \
             libiscsi-dev:s390x \
-            libncurses-dev:s390x \
             libnl-3-dev:s390x \
             libnl-route-3-dev:s390x \
             libnuma-dev:s390x \
diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile
index b8ec601ef1..61840d8990 100644
--- a/ci/containers/libvirt-debian-sid.Dockerfile
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev \
             libgnutls28-dev \
             libiscsi-dev \
-            libncurses-dev \
             libnetcf-dev \
             libnl-3-dev \
             libnl-route-3-dev \
diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-31.Dockerfile
index 7b492d30c0..72e6ae3b69 100644
--- a/ci/containers/libvirt-fedora-31.Dockerfile
+++ b/ci/containers/libvirt-fedora-31.Dockerfile
@@ -58,7 +58,6 @@ RUN dnf update -y && \
         lvm2 \
         make \
         meson \
-        ncurses-devel \
         net-tools \
         netcf-devel \
         nfs-utils \
diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile
index f208f82a2a..ea38a7f084 100644
--- a/ci/containers/libvirt-fedora-32.Dockerfile
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -58,7 +58,6 @@ RUN dnf update -y && \
         lvm2 \
         make \
         meson \
-        ncurses-devel \
         net-tools \
         netcf-devel \
         nfs-utils \
diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile
index 8e092744f6..6da9bc8f69 100644
--- a/ci/containers/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -59,7 +59,6 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         lvm2 \
         make \
         meson \
-        ncurses-devel \
         net-tools \
         netcf-devel \
         nfs-utils \
diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile
index 2ba408efb7..026f3a9dc2 100644
--- a/ci/containers/libvirt-opensuse-151.Dockerfile
+++ b/ci/containers/libvirt-opensuse-151.Dockerfile
@@ -59,7 +59,6 @@ RUN zypper update -y && \
            lsof \
            lvm2 \
            make \
-           ncurses-devel \
            net-tools \
            nfs-utils \
            ninja \
diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile
index 9675130770..e538e33a21 100644
--- a/ci/containers/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglib2.0-dev \
             libgnutls28-dev \
             libiscsi-dev \
-            libncurses5-dev \
             libnetcf-dev \
             libnl-3-dev \
             libnl-route-3-dev \
diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile
index 2457e7a8db..a0aee78662 100644
--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -42,7 +42,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libglusterfs-dev \
             libgnutls28-dev \
             libiscsi-dev \
-            libncurses-dev \
             libnetcf-dev \
             libnl-3-dev \
             libnl-route-3-dev \
-- 
2.26.2

More information about the libvir-list mailing list