[libvirt] [dockerfiles PATCH 2/3] Remove plain Dockerfiles

Andrea Bolognani posted 3 patches 5 weeks ago
Only 2 patches received!

[libvirt] [dockerfiles PATCH 2/3] Remove plain Dockerfiles

Posted by Andrea Bolognani 5 weeks ago
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 buildenv-libosinfo-centos-7.Dockerfile        |  43 -------
 ...bosinfo-debian-10-cross-aarch64.Dockerfile |  64 ----------
 ...ibosinfo-debian-10-cross-armv6l.Dockerfile |  64 ----------
 ...ibosinfo-debian-10-cross-armv7l.Dockerfile |  64 ----------
 ...-libosinfo-debian-10-cross-i686.Dockerfile |  64 ----------
 ...-libosinfo-debian-10-cross-mips.Dockerfile |  64 ----------
 ...osinfo-debian-10-cross-mips64el.Dockerfile |  64 ----------
 ...ibosinfo-debian-10-cross-mipsel.Dockerfile |  64 ----------
 ...bosinfo-debian-10-cross-ppc64le.Dockerfile |  64 ----------
 ...libosinfo-debian-10-cross-s390x.Dockerfile |  64 ----------
 buildenv-libosinfo-debian-10.Dockerfile       |  50 --------
 ...ibosinfo-debian-9-cross-aarch64.Dockerfile |  64 ----------
 ...libosinfo-debian-9-cross-armv6l.Dockerfile |  64 ----------
 ...libosinfo-debian-9-cross-armv7l.Dockerfile |  64 ----------
 ...v-libosinfo-debian-9-cross-mips.Dockerfile |  64 ----------
 ...bosinfo-debian-9-cross-mips64el.Dockerfile |  64 ----------
 ...libosinfo-debian-9-cross-mipsel.Dockerfile |  64 ----------
 ...ibosinfo-debian-9-cross-ppc64le.Dockerfile |  64 ----------
 ...-libosinfo-debian-9-cross-s390x.Dockerfile |  64 ----------
 buildenv-libosinfo-debian-9.Dockerfile        |  50 --------
 ...osinfo-debian-sid-cross-aarch64.Dockerfile |  64 ----------
 ...bosinfo-debian-sid-cross-armv6l.Dockerfile |  64 ----------
 ...bosinfo-debian-sid-cross-armv7l.Dockerfile |  64 ----------
 ...libosinfo-debian-sid-cross-i686.Dockerfile |  64 ----------
 ...libosinfo-debian-sid-cross-mips.Dockerfile |  64 ----------
 ...sinfo-debian-sid-cross-mips64el.Dockerfile |  64 ----------
 ...bosinfo-debian-sid-cross-mipsel.Dockerfile |  64 ----------
 ...osinfo-debian-sid-cross-ppc64le.Dockerfile |  64 ----------
 ...ibosinfo-debian-sid-cross-s390x.Dockerfile |  64 ----------
 buildenv-libosinfo-debian-sid.Dockerfile      |  50 --------
 buildenv-libosinfo-fedora-29.Dockerfile       |  49 --------
 buildenv-libosinfo-fedora-30.Dockerfile       |  49 --------
 buildenv-libosinfo-fedora-rawhide.Dockerfile  |  63 ----------
 buildenv-libosinfo-ubuntu-16.Dockerfile       |  50 --------
 buildenv-libosinfo-ubuntu-18.Dockerfile       |  50 --------
 buildenv-libvirt-centos-7.Dockerfile          |  81 -------------
 ...libvirt-debian-10-cross-aarch64.Dockerfile | 100 ---------------
 ...-libvirt-debian-10-cross-armv6l.Dockerfile |  98 ---------------
 ...-libvirt-debian-10-cross-armv7l.Dockerfile |  99 ---------------
 ...nv-libvirt-debian-10-cross-i686.Dockerfile |  99 ---------------
 ...nv-libvirt-debian-10-cross-mips.Dockerfile |  99 ---------------
 ...ibvirt-debian-10-cross-mips64el.Dockerfile |  99 ---------------
 ...-libvirt-debian-10-cross-mipsel.Dockerfile |  99 ---------------
 ...libvirt-debian-10-cross-ppc64le.Dockerfile |  99 ---------------
 ...v-libvirt-debian-10-cross-s390x.Dockerfile |  99 ---------------
 buildenv-libvirt-debian-10.Dockerfile         |  89 --------------
 ...-libvirt-debian-9-cross-aarch64.Dockerfile | 101 ----------------
 ...v-libvirt-debian-9-cross-armv6l.Dockerfile |  99 ---------------
 ...v-libvirt-debian-9-cross-armv7l.Dockerfile | 100 ---------------
 ...env-libvirt-debian-9-cross-mips.Dockerfile | 100 ---------------
 ...libvirt-debian-9-cross-mips64el.Dockerfile | 100 ---------------
 ...v-libvirt-debian-9-cross-mipsel.Dockerfile | 100 ---------------
 ...-libvirt-debian-9-cross-ppc64le.Dockerfile | 100 ---------------
 ...nv-libvirt-debian-9-cross-s390x.Dockerfile | 100 ---------------
 buildenv-libvirt-debian-9.Dockerfile          |  90 --------------
 ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 100 ---------------
 ...libvirt-debian-sid-cross-armv6l.Dockerfile |  98 ---------------
 ...libvirt-debian-sid-cross-armv7l.Dockerfile |  99 ---------------
 ...v-libvirt-debian-sid-cross-i686.Dockerfile |  99 ---------------
 ...v-libvirt-debian-sid-cross-mips.Dockerfile |  99 ---------------
 ...bvirt-debian-sid-cross-mips64el.Dockerfile |  99 ---------------
 ...libvirt-debian-sid-cross-mipsel.Dockerfile |  99 ---------------
 ...ibvirt-debian-sid-cross-ppc64le.Dockerfile |  99 ---------------
 ...-libvirt-debian-sid-cross-s390x.Dockerfile |  99 ---------------
 buildenv-libvirt-debian-sid.Dockerfile        |  89 --------------
 buildenv-libvirt-fedora-29.Dockerfile         |  89 --------------
 buildenv-libvirt-fedora-30.Dockerfile         |  89 --------------
 buildenv-libvirt-fedora-rawhide.Dockerfile    | 114 ------------------
 buildenv-libvirt-ubuntu-16.Dockerfile         |  91 --------------
 buildenv-libvirt-ubuntu-18.Dockerfile         |  91 --------------
 70 files changed, 5523 deletions(-)
 delete mode 100644 buildenv-libosinfo-centos-7.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-i686.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-mips.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10-cross-s390x.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-10.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-mips.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9-cross-s390x.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-9.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-i686.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-mips.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile
 delete mode 100644 buildenv-libosinfo-debian-sid.Dockerfile
 delete mode 100644 buildenv-libosinfo-fedora-29.Dockerfile
 delete mode 100644 buildenv-libosinfo-fedora-30.Dockerfile
 delete mode 100644 buildenv-libosinfo-fedora-rawhide.Dockerfile
 delete mode 100644 buildenv-libosinfo-ubuntu-16.Dockerfile
 delete mode 100644 buildenv-libosinfo-ubuntu-18.Dockerfile
 delete mode 100644 buildenv-libvirt-centos-7.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-aarch64.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-armv6l.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-armv7l.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-i686.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-mips.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-mips64el.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-mipsel.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10-cross-s390x.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-10.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-aarch64.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-armv6l.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-armv7l.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-mips.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-mips64el.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-mipsel.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9-cross-s390x.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-9.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-i686.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-mips.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid-cross-s390x.Dockerfile
 delete mode 100644 buildenv-libvirt-debian-sid.Dockerfile
 delete mode 100644 buildenv-libvirt-fedora-29.Dockerfile
 delete mode 100644 buildenv-libvirt-fedora-30.Dockerfile
 delete mode 100644 buildenv-libvirt-fedora-rawhide.Dockerfile
 delete mode 100644 buildenv-libvirt-ubuntu-16.Dockerfile
 delete mode 100644 buildenv-libvirt-ubuntu-18.Dockerfile

diff --git a/buildenv-libosinfo-centos-7.Dockerfile b/buildenv-libosinfo-centos-7.Dockerfile
deleted file mode 100644
index 36bdf92..0000000
--- a/buildenv-libosinfo-centos-7.Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM centos:centos7
-
-RUN yum update -y && \
-    yum install -y \
-        autoconf \
-        automake \
-        bash \
-        bash-completion \
-        ca-certificates \
-        check-devel \
-        chrony \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glib2-devel \
-        glibc-devel \
-        gobject-introspection-devel \
-        gtk-doc \
-        hwdata \
-        intltool \
-        json-glib-devel \
-        libarchive-devel \
-        libsoup-devel \
-        libtool \
-        libxml2 \
-        libxml2-devel \
-        libxslt-devel \
-        lsof \
-        make \
-        net-tools \
-        patch \
-        perl \
-        pkgconfig \
-        rpm-build \
-        screen \
-        strace \
-        sudo \
-        vala \
-        vim && \
-    yum autoremove -y && \
-    yum clean all -y
diff --git a/buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile b/buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile
deleted file mode 100644
index 1bff202..0000000
--- a/buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libarchive-dev:arm64 \
-            libc6-dev:arm64 \
-            libgirepository1.0-dev:arm64 \
-            libglib2.0-dev:arm64 \
-            libjson-glib-dev:arm64 \
-            libsoup2.4-dev:arm64 \
-            libxml2-dev:arm64 \
-            libxslt1-dev:arm64 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile b/buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile
deleted file mode 100644
index 3b14d9b..0000000
--- a/buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libarchive-dev:armel \
-            libc6-dev:armel \
-            libgirepository1.0-dev:armel \
-            libglib2.0-dev:armel \
-            libjson-glib-dev:armel \
-            libsoup2.4-dev:armel \
-            libxml2-dev:armel \
-            libxslt1-dev:armel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile b/buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile
deleted file mode 100644
index 2b00962..0000000
--- a/buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libarchive-dev:armhf \
-            libc6-dev:armhf \
-            libgirepository1.0-dev:armhf \
-            libglib2.0-dev:armhf \
-            libjson-glib-dev:armhf \
-            libsoup2.4-dev:armhf \
-            libxml2-dev:armhf \
-            libxslt1-dev:armhf && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-i686.Dockerfile b/buildenv-libosinfo-debian-10-cross-i686.Dockerfile
deleted file mode 100644
index cb4007e..0000000
--- a/buildenv-libosinfo-debian-10-cross-i686.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture i386 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-i686-linux-gnu \
-            libarchive-dev:i386 \
-            libc6-dev:i386 \
-            libgirepository1.0-dev:i386 \
-            libglib2.0-dev:i386 \
-            libjson-glib-dev:i386 \
-            libsoup2.4-dev:i386 \
-            libxml2-dev:i386 \
-            libxslt1-dev:i386 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu \
-                    --target=i686-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-mips.Dockerfile b/buildenv-libosinfo-debian-10-cross-mips.Dockerfile
deleted file mode 100644
index 46180ff..0000000
--- a/buildenv-libosinfo-debian-10-cross-mips.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            libarchive-dev:mips \
-            libc6-dev:mips \
-            libgirepository1.0-dev:mips \
-            libglib2.0-dev:mips \
-            libjson-glib-dev:mips \
-            libsoup2.4-dev:mips \
-            libxml2-dev:mips \
-            libxslt1-dev:mips && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile b/buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile
deleted file mode 100644
index f5009d5..0000000
--- a/buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libarchive-dev:mips64el \
-            libc6-dev:mips64el \
-            libgirepository1.0-dev:mips64el \
-            libglib2.0-dev:mips64el \
-            libjson-glib-dev:mips64el \
-            libsoup2.4-dev:mips64el \
-            libxml2-dev:mips64el \
-            libxslt1-dev:mips64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile b/buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile
deleted file mode 100644
index e8c27e9..0000000
--- a/buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libarchive-dev:mipsel \
-            libc6-dev:mipsel \
-            libgirepository1.0-dev:mipsel \
-            libglib2.0-dev:mipsel \
-            libjson-glib-dev:mipsel \
-            libsoup2.4-dev:mipsel \
-            libxml2-dev:mipsel \
-            libxslt1-dev:mipsel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile b/buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile
deleted file mode 100644
index c489330..0000000
--- a/buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libarchive-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libgirepository1.0-dev:ppc64el \
-            libglib2.0-dev:ppc64el \
-            libjson-glib-dev:ppc64el \
-            libsoup2.4-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libxslt1-dev:ppc64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10-cross-s390x.Dockerfile b/buildenv-libosinfo-debian-10-cross-s390x.Dockerfile
deleted file mode 100644
index 2d98261..0000000
--- a/buildenv-libosinfo-debian-10-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libarchive-dev:s390x \
-            libc6-dev:s390x \
-            libgirepository1.0-dev:s390x \
-            libglib2.0-dev:s390x \
-            libjson-glib-dev:s390x \
-            libsoup2.4-dev:s390x \
-            libxml2-dev:s390x \
-            libxslt1-dev:s390x && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-10.Dockerfile b/buildenv-libosinfo-debian-10.Dockerfile
deleted file mode 100644
index 7d5dfd9..0000000
--- a/buildenv-libosinfo-debian-10.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libarchive-dev \
-            libc6-dev \
-            libgirepository1.0-dev \
-            libglib2.0-dev \
-            libjson-glib-dev \
-            libsoup2.4-dev \
-            libtool \
-            libtool-bin \
-            libxml2-dev \
-            libxml2-utils \
-            libxslt1-dev \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile b/buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile
deleted file mode 100644
index 9864c8b..0000000
--- a/buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libarchive-dev:arm64 \
-            libc6-dev:arm64 \
-            libgirepository1.0-dev:arm64 \
-            libglib2.0-dev:arm64 \
-            libjson-glib-dev:arm64 \
-            libsoup2.4-dev:arm64 \
-            libxml2-dev:arm64 \
-            libxslt1-dev:arm64 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile b/buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile
deleted file mode 100644
index 8d08b28..0000000
--- a/buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libarchive-dev:armel \
-            libc6-dev:armel \
-            libgirepository1.0-dev:armel \
-            libglib2.0-dev:armel \
-            libjson-glib-dev:armel \
-            libsoup2.4-dev:armel \
-            libxml2-dev:armel \
-            libxslt1-dev:armel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile b/buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile
deleted file mode 100644
index e2fd622..0000000
--- a/buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libarchive-dev:armhf \
-            libc6-dev:armhf \
-            libgirepository1.0-dev:armhf \
-            libglib2.0-dev:armhf \
-            libjson-glib-dev:armhf \
-            libsoup2.4-dev:armhf \
-            libxml2-dev:armhf \
-            libxslt1-dev:armhf && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-mips.Dockerfile b/buildenv-libosinfo-debian-9-cross-mips.Dockerfile
deleted file mode 100644
index d30889a..0000000
--- a/buildenv-libosinfo-debian-9-cross-mips.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            libarchive-dev:mips \
-            libc6-dev:mips \
-            libgirepository1.0-dev:mips \
-            libglib2.0-dev:mips \
-            libjson-glib-dev:mips \
-            libsoup2.4-dev:mips \
-            libxml2-dev:mips \
-            libxslt1-dev:mips && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile b/buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile
deleted file mode 100644
index bc7cc6c..0000000
--- a/buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libarchive-dev:mips64el \
-            libc6-dev:mips64el \
-            libgirepository1.0-dev:mips64el \
-            libglib2.0-dev:mips64el \
-            libjson-glib-dev:mips64el \
-            libsoup2.4-dev:mips64el \
-            libxml2-dev:mips64el \
-            libxslt1-dev:mips64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile b/buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile
deleted file mode 100644
index f54789c..0000000
--- a/buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libarchive-dev:mipsel \
-            libc6-dev:mipsel \
-            libgirepository1.0-dev:mipsel \
-            libglib2.0-dev:mipsel \
-            libjson-glib-dev:mipsel \
-            libsoup2.4-dev:mipsel \
-            libxml2-dev:mipsel \
-            libxslt1-dev:mipsel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile b/buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile
deleted file mode 100644
index 8f1ee44..0000000
--- a/buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libarchive-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libgirepository1.0-dev:ppc64el \
-            libglib2.0-dev:ppc64el \
-            libjson-glib-dev:ppc64el \
-            libsoup2.4-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libxslt1-dev:ppc64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9-cross-s390x.Dockerfile b/buildenv-libosinfo-debian-9-cross-s390x.Dockerfile
deleted file mode 100644
index 9732c70..0000000
--- a/buildenv-libosinfo-debian-9-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libarchive-dev:s390x \
-            libc6-dev:s390x \
-            libgirepository1.0-dev:s390x \
-            libglib2.0-dev:s390x \
-            libjson-glib-dev:s390x \
-            libsoup2.4-dev:s390x \
-            libxml2-dev:s390x \
-            libxslt1-dev:s390x && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-9.Dockerfile b/buildenv-libosinfo-debian-9.Dockerfile
deleted file mode 100644
index 0a66494..0000000
--- a/buildenv-libosinfo-debian-9.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libarchive-dev \
-            libc6-dev \
-            libgirepository1.0-dev \
-            libglib2.0-dev \
-            libjson-glib-dev \
-            libsoup2.4-dev \
-            libtool \
-            libtool-bin \
-            libxml2-dev \
-            libxml2-utils \
-            libxslt1-dev \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile b/buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile
deleted file mode 100644
index aec41c1..0000000
--- a/buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libarchive-dev:arm64 \
-            libc6-dev:arm64 \
-            libgirepository1.0-dev:arm64 \
-            libglib2.0-dev:arm64 \
-            libjson-glib-dev:arm64 \
-            libsoup2.4-dev:arm64 \
-            libxml2-dev:arm64 \
-            libxslt1-dev:arm64 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile b/buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile
deleted file mode 100644
index 30f60ba..0000000
--- a/buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libarchive-dev:armel \
-            libc6-dev:armel \
-            libgirepository1.0-dev:armel \
-            libglib2.0-dev:armel \
-            libjson-glib-dev:armel \
-            libsoup2.4-dev:armel \
-            libxml2-dev:armel \
-            libxslt1-dev:armel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile b/buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile
deleted file mode 100644
index e3d253c..0000000
--- a/buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libarchive-dev:armhf \
-            libc6-dev:armhf \
-            libgirepository1.0-dev:armhf \
-            libglib2.0-dev:armhf \
-            libjson-glib-dev:armhf \
-            libsoup2.4-dev:armhf \
-            libxml2-dev:armhf \
-            libxslt1-dev:armhf && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-i686.Dockerfile b/buildenv-libosinfo-debian-sid-cross-i686.Dockerfile
deleted file mode 100644
index 3101d79..0000000
--- a/buildenv-libosinfo-debian-sid-cross-i686.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture i386 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-i686-linux-gnu \
-            libarchive-dev:i386 \
-            libc6-dev:i386 \
-            libgirepository1.0-dev:i386 \
-            libglib2.0-dev:i386 \
-            libjson-glib-dev:i386 \
-            libsoup2.4-dev:i386 \
-            libxml2-dev:i386 \
-            libxslt1-dev:i386 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu \
-                    --target=i686-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-mips.Dockerfile b/buildenv-libosinfo-debian-sid-cross-mips.Dockerfile
deleted file mode 100644
index 7708baf..0000000
--- a/buildenv-libosinfo-debian-sid-cross-mips.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            libarchive-dev:mips \
-            libc6-dev:mips \
-            libgirepository1.0-dev:mips \
-            libglib2.0-dev:mips \
-            libjson-glib-dev:mips \
-            libsoup2.4-dev:mips \
-            libxml2-dev:mips \
-            libxslt1-dev:mips && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile b/buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile
deleted file mode 100644
index e487c33..0000000
--- a/buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libarchive-dev:mips64el \
-            libc6-dev:mips64el \
-            libgirepository1.0-dev:mips64el \
-            libglib2.0-dev:mips64el \
-            libjson-glib-dev:mips64el \
-            libsoup2.4-dev:mips64el \
-            libxml2-dev:mips64el \
-            libxslt1-dev:mips64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile b/buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile
deleted file mode 100644
index 04d1451..0000000
--- a/buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libarchive-dev:mipsel \
-            libc6-dev:mipsel \
-            libgirepository1.0-dev:mipsel \
-            libglib2.0-dev:mipsel \
-            libjson-glib-dev:mipsel \
-            libsoup2.4-dev:mipsel \
-            libxml2-dev:mipsel \
-            libxslt1-dev:mipsel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile b/buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile
deleted file mode 100644
index c9007b7..0000000
--- a/buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libarchive-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libgirepository1.0-dev:ppc64el \
-            libglib2.0-dev:ppc64el \
-            libjson-glib-dev:ppc64el \
-            libsoup2.4-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libxslt1-dev:ppc64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile b/buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile
deleted file mode 100644
index dec0428..0000000
--- a/buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libarchive-dev:s390x \
-            libc6-dev:s390x \
-            libgirepository1.0-dev:s390x \
-            libglib2.0-dev:s390x \
-            libjson-glib-dev:s390x \
-            libsoup2.4-dev:s390x \
-            libxml2-dev:s390x \
-            libxslt1-dev:s390x && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
diff --git a/buildenv-libosinfo-debian-sid.Dockerfile b/buildenv-libosinfo-debian-sid.Dockerfile
deleted file mode 100644
index 6801519..0000000
--- a/buildenv-libosinfo-debian-sid.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libarchive-dev \
-            libc6-dev \
-            libgirepository1.0-dev \
-            libglib2.0-dev \
-            libjson-glib-dev \
-            libsoup2.4-dev \
-            libtool \
-            libtool-bin \
-            libxml2-dev \
-            libxml2-utils \
-            libxslt1-dev \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libosinfo-fedora-29.Dockerfile b/buildenv-libosinfo-fedora-29.Dockerfile
deleted file mode 100644
index bebf28e..0000000
--- a/buildenv-libosinfo-fedora-29.Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM fedora:29
-
-RUN dnf update -y && \
-    dnf install -y \
-        autoconf \
-        automake \
-        bash \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        check-devel \
-        chrony \
-        cppi \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glib2-devel \
-        glibc-devel \
-        gobject-introspection-devel \
-        gtk-doc \
-        hwdata \
-        intltool \
-        json-glib-devel \
-        libarchive-devel \
-        libsoup-devel \
-        libtool \
-        libxml2 \
-        libxml2-devel \
-        libxslt-devel \
-        lsof \
-        make \
-        net-tools \
-        patch \
-        perl \
-        pkgconfig \
-        python3 \
-        python3-lxml \
-        python3-pytest \
-        python3-requests \
-        rpm-build \
-        screen \
-        strace \
-        sudo \
-        vala \
-        vim && \
-    dnf autoremove -y && \
-    dnf clean all -y
diff --git a/buildenv-libosinfo-fedora-30.Dockerfile b/buildenv-libosinfo-fedora-30.Dockerfile
deleted file mode 100644
index 54e5a3b..0000000
--- a/buildenv-libosinfo-fedora-30.Dockerfile
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM fedora:30
-
-RUN dnf update -y && \
-    dnf install -y \
-        autoconf \
-        automake \
-        bash \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        check-devel \
-        chrony \
-        cppi \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glib2-devel \
-        glibc-devel \
-        gobject-introspection-devel \
-        gtk-doc \
-        hwdata \
-        intltool \
-        json-glib-devel \
-        libarchive-devel \
-        libsoup-devel \
-        libtool \
-        libxml2 \
-        libxml2-devel \
-        libxslt-devel \
-        lsof \
-        make \
-        net-tools \
-        patch \
-        perl \
-        pkgconfig \
-        python3 \
-        python3-lxml \
-        python3-pytest \
-        python3-requests \
-        rpm-build \
-        screen \
-        strace \
-        sudo \
-        vala \
-        vim && \
-    dnf autoremove -y && \
-    dnf clean all -y
diff --git a/buildenv-libosinfo-fedora-rawhide.Dockerfile b/buildenv-libosinfo-fedora-rawhide.Dockerfile
deleted file mode 100644
index b0bdf1d..0000000
--- a/buildenv-libosinfo-fedora-rawhide.Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM fedora:rawhide
-
-RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
-    dnf update -y && \
-    dnf install -y \
-        autoconf \
-        automake \
-        bash \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        check-devel \
-        chrony \
-        cppi \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glib2-devel \
-        glibc-devel \
-        gobject-introspection-devel \
-        gtk-doc \
-        hwdata \
-        intltool \
-        json-glib-devel \
-        libarchive-devel \
-        libsoup-devel \
-        libtool \
-        libxml2 \
-        libxml2-devel \
-        libxslt-devel \
-        lsof \
-        make \
-        mingw32-glib2 \
-        mingw32-json-glib \
-        mingw32-libarchive \
-        mingw32-libsoup \
-        mingw32-libxml2 \
-        mingw32-libxslt \
-        mingw64-glib2 \
-        mingw64-json-glib \
-        mingw64-libarchive \
-        mingw64-libsoup \
-        mingw64-libxml2 \
-        mingw64-libxslt \
-        net-tools \
-        patch \
-        perl \
-        pkgconfig \
-        python3 \
-        python3-lxml \
-        python3-pytest \
-        python3-requests \
-        rpm-build \
-        screen \
-        strace \
-        sudo \
-        vala \
-        vim \
-        wget && \
-    dnf autoremove -y && \
-    dnf clean all -y
diff --git a/buildenv-libosinfo-ubuntu-16.Dockerfile b/buildenv-libosinfo-ubuntu-16.Dockerfile
deleted file mode 100644
index b41ed8d..0000000
--- a/buildenv-libosinfo-ubuntu-16.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM ubuntu:16.04
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libarchive-dev \
-            libc6-dev \
-            libgirepository1.0-dev \
-            libglib2.0-dev \
-            libjson-glib-dev \
-            libsoup2.4-dev \
-            libtool \
-            libtool-bin \
-            libxml2-dev \
-            libxml2-utils \
-            libxslt1-dev \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libosinfo-ubuntu-18.Dockerfile b/buildenv-libosinfo-ubuntu-18.Dockerfile
deleted file mode 100644
index b3af364..0000000
--- a/buildenv-libosinfo-ubuntu-18.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM ubuntu:18.04
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            check \
-            chrony \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            gtk-doc-tools \
-            hwdata \
-            intltool \
-            libarchive-dev \
-            libc6-dev \
-            libgirepository1.0-dev \
-            libglib2.0-dev \
-            libjson-glib-dev \
-            libsoup2.4-dev \
-            libtool \
-            libtool-bin \
-            libxml2-dev \
-            libxml2-utils \
-            libxslt1-dev \
-            lsof \
-            make \
-            net-tools \
-            patch \
-            perl \
-            pkgconf \
-            python3 \
-            python3-lxml \
-            python3-pytest \
-            python3-requests \
-            screen \
-            strace \
-            sudo \
-            valac \
-            vim && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libvirt-centos-7.Dockerfile b/buildenv-libvirt-centos-7.Dockerfile
deleted file mode 100644
index 298bbc7..0000000
--- a/buildenv-libvirt-centos-7.Dockerfile
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM centos:centos7
-
-RUN yum update -y && \
-    yum install -y \
-        audit-libs-devel \
-        augeas \
-        autoconf \
-        automake \
-        avahi-devel \
-        bash \
-        bash-completion \
-        ca-certificates \
-        chrony \
-        cyrus-sasl-devel \
-        dbus-devel \
-        device-mapper-devel \
-        dnsmasq \
-        ebtables \
-        fuse-devel \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glibc-common \
-        glibc-devel \
-        glusterfs-api-devel \
-        gnutls-devel \
-        iproute \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd1-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libtool \
-        libudev-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lsof \
-        lvm2 \
-        make \
-        ncurses-devel \
-        net-tools \
-        netcf-devel \
-        nfs-utils \
-        numactl-devel \
-        numad \
-        parted \
-        parted-devel \
-        patch \
-        perl \
-        pkgconfig \
-        polkit \
-        qemu-img \
-        radvd \
-        readline-devel \
-        rpm-build \
-        sanlock-devel \
-        screen \
-        scrub \
-        strace \
-        sudo \
-        systemtap-sdt-devel \
-        vim \
-        xfsprogs-devel \
-        yajl-devel && \
-    yum autoremove -y && \
-    yum clean all -y
diff --git a/buildenv-libvirt-debian-10-cross-aarch64.Dockerfile b/buildenv-libvirt-debian-10-cross-aarch64.Dockerfile
deleted file mode 100644
index 9498453..0000000
--- a/buildenv-libvirt-debian-10-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libacl1-dev:arm64 \
-            libapparmor-dev:arm64 \
-            libattr1-dev:arm64 \
-            libaudit-dev:arm64 \
-            libavahi-client-dev:arm64 \
-            libblkid-dev:arm64 \
-            libc6-dev:arm64 \
-            libcap-ng-dev:arm64 \
-            libcurl4-gnutls-dev:arm64 \
-            libdbus-1-dev:arm64 \
-            libdevmapper-dev:arm64 \
-            libfuse-dev:arm64 \
-            libglusterfs-dev:arm64 \
-            libgnutls28-dev:arm64 \
-            libiscsi-dev:arm64 \
-            libncurses-dev:arm64 \
-            libnl-3-dev:arm64 \
-            libnl-route-3-dev:arm64 \
-            libnuma-dev:arm64 \
-            libparted-dev:arm64 \
-            libpcap0.8-dev:arm64 \
-            libpciaccess-dev:arm64 \
-            librbd-dev:arm64 \
-            libreadline-dev:arm64 \
-            libsanlock-dev:arm64 \
-            libsasl2-dev:arm64 \
-            libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
-            libssh2-1-dev:arm64 \
-            libtirpc-dev:arm64 \
-            libudev-dev:arm64 \
-            libxen-dev:arm64 \
-            libxml2-dev:arm64 \
-            libyajl-dev:arm64 \
-            xfslibs-dev:arm64 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-armv6l.Dockerfile b/buildenv-libvirt-debian-10-cross-armv6l.Dockerfile
deleted file mode 100644
index d15cad1..0000000
--- a/buildenv-libvirt-debian-10-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,98 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libacl1-dev:armel \
-            libapparmor-dev:armel \
-            libattr1-dev:armel \
-            libaudit-dev:armel \
-            libavahi-client-dev:armel \
-            libblkid-dev:armel \
-            libc6-dev:armel \
-            libcap-ng-dev:armel \
-            libcurl4-gnutls-dev:armel \
-            libdbus-1-dev:armel \
-            libdevmapper-dev:armel \
-            libfuse-dev:armel \
-            libglusterfs-dev:armel \
-            libgnutls28-dev:armel \
-            libiscsi-dev:armel \
-            libncurses-dev:armel \
-            libnl-3-dev:armel \
-            libnl-route-3-dev:armel \
-            libparted-dev:armel \
-            libpcap0.8-dev:armel \
-            libpciaccess-dev:armel \
-            librbd-dev:armel \
-            libreadline-dev:armel \
-            libsanlock-dev:armel \
-            libsasl2-dev:armel \
-            libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
-            libssh2-1-dev:armel \
-            libtirpc-dev:armel \
-            libudev-dev:armel \
-            libxml2-dev:armel \
-            libyajl-dev:armel \
-            xfslibs-dev:armel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-armv7l.Dockerfile b/buildenv-libvirt-debian-10-cross-armv7l.Dockerfile
deleted file mode 100644
index 3cfc08d..0000000
--- a/buildenv-libvirt-debian-10-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libacl1-dev:armhf \
-            libapparmor-dev:armhf \
-            libattr1-dev:armhf \
-            libaudit-dev:armhf \
-            libavahi-client-dev:armhf \
-            libblkid-dev:armhf \
-            libc6-dev:armhf \
-            libcap-ng-dev:armhf \
-            libcurl4-gnutls-dev:armhf \
-            libdbus-1-dev:armhf \
-            libdevmapper-dev:armhf \
-            libfuse-dev:armhf \
-            libglusterfs-dev:armhf \
-            libgnutls28-dev:armhf \
-            libiscsi-dev:armhf \
-            libncurses-dev:armhf \
-            libnl-3-dev:armhf \
-            libnl-route-3-dev:armhf \
-            libparted-dev:armhf \
-            libpcap0.8-dev:armhf \
-            libpciaccess-dev:armhf \
-            librbd-dev:armhf \
-            libreadline-dev:armhf \
-            libsanlock-dev:armhf \
-            libsasl2-dev:armhf \
-            libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
-            libssh2-1-dev:armhf \
-            libtirpc-dev:armhf \
-            libudev-dev:armhf \
-            libxen-dev:armhf \
-            libxml2-dev:armhf \
-            libyajl-dev:armhf \
-            xfslibs-dev:armhf && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-i686.Dockerfile b/buildenv-libvirt-debian-10-cross-i686.Dockerfile
deleted file mode 100644
index fce15ca..0000000
--- a/buildenv-libvirt-debian-10-cross-i686.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture i386 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-i686-linux-gnu \
-            libacl1-dev:i386 \
-            libapparmor-dev:i386 \
-            libattr1-dev:i386 \
-            libaudit-dev:i386 \
-            libavahi-client-dev:i386 \
-            libblkid-dev:i386 \
-            libc6-dev:i386 \
-            libcap-ng-dev:i386 \
-            libcurl4-gnutls-dev:i386 \
-            libdbus-1-dev:i386 \
-            libdevmapper-dev:i386 \
-            libfuse-dev:i386 \
-            libglusterfs-dev:i386 \
-            libgnutls28-dev:i386 \
-            libiscsi-dev:i386 \
-            libncurses-dev:i386 \
-            libnl-3-dev:i386 \
-            libnl-route-3-dev:i386 \
-            libnuma-dev:i386 \
-            libparted-dev:i386 \
-            libpcap0.8-dev:i386 \
-            libpciaccess-dev:i386 \
-            librbd-dev:i386 \
-            libreadline-dev:i386 \
-            libsanlock-dev:i386 \
-            libsasl2-dev:i386 \
-            libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
-            libssh2-1-dev:i386 \
-            libtirpc-dev:i386 \
-            libudev-dev:i386 \
-            libxml2-dev:i386 \
-            libyajl-dev:i386 \
-            xfslibs-dev:i386 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu \
-                    --target=i686-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-mips.Dockerfile b/buildenv-libvirt-debian-10-cross-mips.Dockerfile
deleted file mode 100644
index be4fa18..0000000
--- a/buildenv-libvirt-debian-10-cross-mips.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            libacl1-dev:mips \
-            libapparmor-dev:mips \
-            libattr1-dev:mips \
-            libaudit-dev:mips \
-            libavahi-client-dev:mips \
-            libblkid-dev:mips \
-            libc6-dev:mips \
-            libcap-ng-dev:mips \
-            libcurl4-gnutls-dev:mips \
-            libdbus-1-dev:mips \
-            libdevmapper-dev:mips \
-            libfuse-dev:mips \
-            libglusterfs-dev:mips \
-            libgnutls28-dev:mips \
-            libiscsi-dev:mips \
-            libncurses-dev:mips \
-            libnl-3-dev:mips \
-            libnl-route-3-dev:mips \
-            libnuma-dev:mips \
-            libparted-dev:mips \
-            libpcap0.8-dev:mips \
-            libpciaccess-dev:mips \
-            librbd-dev:mips \
-            libreadline-dev:mips \
-            libsanlock-dev:mips \
-            libsasl2-dev:mips \
-            libselinux1-dev:mips \
-            libssh-gcrypt-dev:mips \
-            libssh2-1-dev:mips \
-            libtirpc-dev:mips \
-            libudev-dev:mips \
-            libxml2-dev:mips \
-            libyajl-dev:mips \
-            xfslibs-dev:mips && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-mips64el.Dockerfile b/buildenv-libvirt-debian-10-cross-mips64el.Dockerfile
deleted file mode 100644
index 4720fa9..0000000
--- a/buildenv-libvirt-debian-10-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libacl1-dev:mips64el \
-            libapparmor-dev:mips64el \
-            libattr1-dev:mips64el \
-            libaudit-dev:mips64el \
-            libavahi-client-dev:mips64el \
-            libblkid-dev:mips64el \
-            libc6-dev:mips64el \
-            libcap-ng-dev:mips64el \
-            libcurl4-gnutls-dev:mips64el \
-            libdbus-1-dev:mips64el \
-            libdevmapper-dev:mips64el \
-            libfuse-dev:mips64el \
-            libglusterfs-dev:mips64el \
-            libgnutls28-dev:mips64el \
-            libiscsi-dev:mips64el \
-            libncurses-dev:mips64el \
-            libnl-3-dev:mips64el \
-            libnl-route-3-dev:mips64el \
-            libnuma-dev:mips64el \
-            libparted-dev:mips64el \
-            libpcap0.8-dev:mips64el \
-            libpciaccess-dev:mips64el \
-            librbd-dev:mips64el \
-            libreadline-dev:mips64el \
-            libsanlock-dev:mips64el \
-            libsasl2-dev:mips64el \
-            libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
-            libssh2-1-dev:mips64el \
-            libtirpc-dev:mips64el \
-            libudev-dev:mips64el \
-            libxml2-dev:mips64el \
-            libyajl-dev:mips64el \
-            xfslibs-dev:mips64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-mipsel.Dockerfile b/buildenv-libvirt-debian-10-cross-mipsel.Dockerfile
deleted file mode 100644
index de2ff60..0000000
--- a/buildenv-libvirt-debian-10-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libacl1-dev:mipsel \
-            libapparmor-dev:mipsel \
-            libattr1-dev:mipsel \
-            libaudit-dev:mipsel \
-            libavahi-client-dev:mipsel \
-            libblkid-dev:mipsel \
-            libc6-dev:mipsel \
-            libcap-ng-dev:mipsel \
-            libcurl4-gnutls-dev:mipsel \
-            libdbus-1-dev:mipsel \
-            libdevmapper-dev:mipsel \
-            libfuse-dev:mipsel \
-            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 \
-            libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
-            libssh2-1-dev:mipsel \
-            libtirpc-dev:mipsel \
-            libudev-dev:mipsel \
-            libxml2-dev:mipsel \
-            libyajl-dev:mipsel \
-            xfslibs-dev:mipsel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile b/buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile
deleted file mode 100644
index fb8c829..0000000
--- a/buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libacl1-dev:ppc64el \
-            libapparmor-dev:ppc64el \
-            libattr1-dev:ppc64el \
-            libaudit-dev:ppc64el \
-            libavahi-client-dev:ppc64el \
-            libblkid-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libcap-ng-dev:ppc64el \
-            libcurl4-gnutls-dev:ppc64el \
-            libdbus-1-dev:ppc64el \
-            libdevmapper-dev:ppc64el \
-            libfuse-dev:ppc64el \
-            libglusterfs-dev:ppc64el \
-            libgnutls28-dev:ppc64el \
-            libiscsi-dev:ppc64el \
-            libncurses-dev:ppc64el \
-            libnl-3-dev:ppc64el \
-            libnl-route-3-dev:ppc64el \
-            libnuma-dev:ppc64el \
-            libparted-dev:ppc64el \
-            libpcap0.8-dev:ppc64el \
-            libpciaccess-dev:ppc64el \
-            librbd-dev:ppc64el \
-            libreadline-dev:ppc64el \
-            libsanlock-dev:ppc64el \
-            libsasl2-dev:ppc64el \
-            libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
-            libssh2-1-dev:ppc64el \
-            libtirpc-dev:ppc64el \
-            libudev-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libyajl-dev:ppc64el \
-            xfslibs-dev:ppc64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-10-cross-s390x.Dockerfile b/buildenv-libvirt-debian-10-cross-s390x.Dockerfile
deleted file mode 100644
index 09cb694..0000000
--- a/buildenv-libvirt-debian-10-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libacl1-dev:s390x \
-            libapparmor-dev:s390x \
-            libattr1-dev:s390x \
-            libaudit-dev:s390x \
-            libavahi-client-dev:s390x \
-            libblkid-dev:s390x \
-            libc6-dev:s390x \
-            libcap-ng-dev:s390x \
-            libcurl4-gnutls-dev:s390x \
-            libdbus-1-dev:s390x \
-            libdevmapper-dev:s390x \
-            libfuse-dev:s390x \
-            libglusterfs-dev:s390x \
-            libgnutls28-dev:s390x \
-            libiscsi-dev:s390x \
-            libncurses-dev:s390x \
-            libnl-3-dev:s390x \
-            libnl-route-3-dev:s390x \
-            libnuma-dev:s390x \
-            libparted-dev:s390x \
-            libpcap0.8-dev:s390x \
-            libpciaccess-dev:s390x \
-            librbd-dev:s390x \
-            libreadline-dev:s390x \
-            libsanlock-dev:s390x \
-            libsasl2-dev:s390x \
-            libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
-            libssh2-1-dev:s390x \
-            libtirpc-dev:s390x \
-            libudev-dev:s390x \
-            libxml2-dev:s390x \
-            libyajl-dev:s390x \
-            xfslibs-dev:s390x && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-10.Dockerfile b/buildenv-libvirt-debian-10.Dockerfile
deleted file mode 100644
index a3a1e34..0000000
--- a/buildenv-libvirt-debian-10.Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-FROM debian:10
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libavahi-client-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdbus-1-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libncurses-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-gcrypt-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libtool \
-            libtool-bin \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            systemtap-sdt-dev \
-            vim \
-            wireshark-dev \
-            xfslibs-dev \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libvirt-debian-9-cross-aarch64.Dockerfile b/buildenv-libvirt-debian-9-cross-aarch64.Dockerfile
deleted file mode 100644
index 45bbe80..0000000
--- a/buildenv-libvirt-debian-9-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,101 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            glusterfs-common:arm64 \
-            libacl1-dev:arm64 \
-            libapparmor-dev:arm64 \
-            libattr1-dev:arm64 \
-            libaudit-dev:arm64 \
-            libavahi-client-dev:arm64 \
-            libblkid-dev:arm64 \
-            libc6-dev:arm64 \
-            libcap-ng-dev:arm64 \
-            libcurl4-gnutls-dev:arm64 \
-            libdbus-1-dev:arm64 \
-            libdevmapper-dev:arm64 \
-            libfuse-dev:arm64 \
-            libgnutls28-dev:arm64 \
-            libiscsi-dev:arm64 \
-            libncurses5-dev:arm64 \
-            libnl-3-dev:arm64 \
-            libnl-route-3-dev:arm64 \
-            libnuma-dev:arm64 \
-            libparted-dev:arm64 \
-            libpcap0.8-dev:arm64 \
-            libpciaccess-dev:arm64 \
-            librbd-dev:arm64 \
-            libreadline-dev:arm64 \
-            libsanlock-dev:arm64 \
-            libsasl2-dev:arm64 \
-            libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
-            libssh2-1-dev:arm64 \
-            libtirpc-dev:arm64 \
-            libudev-dev:arm64 \
-            libxen-dev:arm64 \
-            libxml2-dev:arm64 \
-            libyajl-dev:arm64 \
-            xfslibs-dev:arm64 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-armv6l.Dockerfile b/buildenv-libvirt-debian-9-cross-armv6l.Dockerfile
deleted file mode 100644
index 4616fb2..0000000
--- a/buildenv-libvirt-debian-9-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            glusterfs-common:armel \
-            libacl1-dev:armel \
-            libapparmor-dev:armel \
-            libattr1-dev:armel \
-            libaudit-dev:armel \
-            libavahi-client-dev:armel \
-            libblkid-dev:armel \
-            libc6-dev:armel \
-            libcap-ng-dev:armel \
-            libcurl4-gnutls-dev:armel \
-            libdbus-1-dev:armel \
-            libdevmapper-dev:armel \
-            libfuse-dev:armel \
-            libgnutls28-dev:armel \
-            libiscsi-dev:armel \
-            libncurses5-dev:armel \
-            libnl-3-dev:armel \
-            libnl-route-3-dev:armel \
-            libparted-dev:armel \
-            libpcap0.8-dev:armel \
-            libpciaccess-dev:armel \
-            librbd-dev:armel \
-            libreadline-dev:armel \
-            libsanlock-dev:armel \
-            libsasl2-dev:armel \
-            libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
-            libssh2-1-dev:armel \
-            libtirpc-dev:armel \
-            libudev-dev:armel \
-            libxml2-dev:armel \
-            libyajl-dev:armel \
-            xfslibs-dev:armel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-armv7l.Dockerfile b/buildenv-libvirt-debian-9-cross-armv7l.Dockerfile
deleted file mode 100644
index 13109cd..0000000
--- a/buildenv-libvirt-debian-9-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            glusterfs-common:armhf \
-            libacl1-dev:armhf \
-            libapparmor-dev:armhf \
-            libattr1-dev:armhf \
-            libaudit-dev:armhf \
-            libavahi-client-dev:armhf \
-            libblkid-dev:armhf \
-            libc6-dev:armhf \
-            libcap-ng-dev:armhf \
-            libcurl4-gnutls-dev:armhf \
-            libdbus-1-dev:armhf \
-            libdevmapper-dev:armhf \
-            libfuse-dev:armhf \
-            libgnutls28-dev:armhf \
-            libiscsi-dev:armhf \
-            libncurses5-dev:armhf \
-            libnl-3-dev:armhf \
-            libnl-route-3-dev:armhf \
-            libparted-dev:armhf \
-            libpcap0.8-dev:armhf \
-            libpciaccess-dev:armhf \
-            librbd-dev:armhf \
-            libreadline-dev:armhf \
-            libsanlock-dev:armhf \
-            libsasl2-dev:armhf \
-            libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
-            libssh2-1-dev:armhf \
-            libtirpc-dev:armhf \
-            libudev-dev:armhf \
-            libxen-dev:armhf \
-            libxml2-dev:armhf \
-            libyajl-dev:armhf \
-            xfslibs-dev:armhf && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-mips.Dockerfile b/buildenv-libvirt-debian-9-cross-mips.Dockerfile
deleted file mode 100644
index 5417d7c..0000000
--- a/buildenv-libvirt-debian-9-cross-mips.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            glusterfs-common:mips \
-            libacl1-dev:mips \
-            libapparmor-dev:mips \
-            libattr1-dev:mips \
-            libaudit-dev:mips \
-            libavahi-client-dev:mips \
-            libblkid-dev:mips \
-            libc6-dev:mips \
-            libcap-ng-dev:mips \
-            libcurl4-gnutls-dev:mips \
-            libdbus-1-dev:mips \
-            libdevmapper-dev:mips \
-            libfuse-dev:mips \
-            libgnutls28-dev:mips \
-            libiscsi-dev:mips \
-            libncurses5-dev:mips \
-            libnl-3-dev:mips \
-            libnl-route-3-dev:mips \
-            libnuma-dev:mips \
-            libparted-dev:mips \
-            libpcap0.8-dev:mips \
-            libpciaccess-dev:mips \
-            librbd-dev:mips \
-            libreadline-dev:mips \
-            libsanlock-dev:mips \
-            libsasl2-dev:mips \
-            libselinux1-dev:mips \
-            libssh-gcrypt-dev:mips \
-            libssh2-1-dev:mips \
-            libtirpc-dev:mips \
-            libudev-dev:mips \
-            libxml2-dev:mips \
-            libyajl-dev:mips \
-            xfslibs-dev:mips && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-mips64el.Dockerfile b/buildenv-libvirt-debian-9-cross-mips64el.Dockerfile
deleted file mode 100644
index 569309c..0000000
--- a/buildenv-libvirt-debian-9-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            glusterfs-common:mips64el \
-            libacl1-dev:mips64el \
-            libapparmor-dev:mips64el \
-            libattr1-dev:mips64el \
-            libaudit-dev:mips64el \
-            libavahi-client-dev:mips64el \
-            libblkid-dev:mips64el \
-            libc6-dev:mips64el \
-            libcap-ng-dev:mips64el \
-            libcurl4-gnutls-dev:mips64el \
-            libdbus-1-dev:mips64el \
-            libdevmapper-dev:mips64el \
-            libfuse-dev:mips64el \
-            libgnutls28-dev:mips64el \
-            libiscsi-dev:mips64el \
-            libncurses5-dev:mips64el \
-            libnl-3-dev:mips64el \
-            libnl-route-3-dev:mips64el \
-            libnuma-dev:mips64el \
-            libparted-dev:mips64el \
-            libpcap0.8-dev:mips64el \
-            libpciaccess-dev:mips64el \
-            librbd-dev:mips64el \
-            libreadline-dev:mips64el \
-            libsanlock-dev:mips64el \
-            libsasl2-dev:mips64el \
-            libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
-            libssh2-1-dev:mips64el \
-            libtirpc-dev:mips64el \
-            libudev-dev:mips64el \
-            libxml2-dev:mips64el \
-            libyajl-dev:mips64el \
-            xfslibs-dev:mips64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-mipsel.Dockerfile b/buildenv-libvirt-debian-9-cross-mipsel.Dockerfile
deleted file mode 100644
index 9974776..0000000
--- a/buildenv-libvirt-debian-9-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            glusterfs-common:mipsel \
-            libacl1-dev:mipsel \
-            libapparmor-dev:mipsel \
-            libattr1-dev:mipsel \
-            libaudit-dev:mipsel \
-            libavahi-client-dev:mipsel \
-            libblkid-dev:mipsel \
-            libc6-dev:mipsel \
-            libcap-ng-dev:mipsel \
-            libcurl4-gnutls-dev:mipsel \
-            libdbus-1-dev:mipsel \
-            libdevmapper-dev:mipsel \
-            libfuse-dev:mipsel \
-            libgnutls28-dev:mipsel \
-            libiscsi-dev:mipsel \
-            libncurses5-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 \
-            libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
-            libssh2-1-dev:mipsel \
-            libtirpc-dev:mipsel \
-            libudev-dev:mipsel \
-            libxml2-dev:mipsel \
-            libyajl-dev:mipsel \
-            xfslibs-dev:mipsel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile b/buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile
deleted file mode 100644
index b96b2a2..0000000
--- a/buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            glusterfs-common:ppc64el \
-            libacl1-dev:ppc64el \
-            libapparmor-dev:ppc64el \
-            libattr1-dev:ppc64el \
-            libaudit-dev:ppc64el \
-            libavahi-client-dev:ppc64el \
-            libblkid-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libcap-ng-dev:ppc64el \
-            libcurl4-gnutls-dev:ppc64el \
-            libdbus-1-dev:ppc64el \
-            libdevmapper-dev:ppc64el \
-            libfuse-dev:ppc64el \
-            libgnutls28-dev:ppc64el \
-            libiscsi-dev:ppc64el \
-            libncurses5-dev:ppc64el \
-            libnl-3-dev:ppc64el \
-            libnl-route-3-dev:ppc64el \
-            libnuma-dev:ppc64el \
-            libparted-dev:ppc64el \
-            libpcap0.8-dev:ppc64el \
-            libpciaccess-dev:ppc64el \
-            librbd-dev:ppc64el \
-            libreadline-dev:ppc64el \
-            libsanlock-dev:ppc64el \
-            libsasl2-dev:ppc64el \
-            libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
-            libssh2-1-dev:ppc64el \
-            libtirpc-dev:ppc64el \
-            libudev-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libyajl-dev:ppc64el \
-            xfslibs-dev:ppc64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-9-cross-s390x.Dockerfile b/buildenv-libvirt-debian-9-cross-s390x.Dockerfile
deleted file mode 100644
index 9b3a668..0000000
--- a/buildenv-libvirt-debian-9-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            glusterfs-common:s390x \
-            libacl1-dev:s390x \
-            libapparmor-dev:s390x \
-            libattr1-dev:s390x \
-            libaudit-dev:s390x \
-            libavahi-client-dev:s390x \
-            libblkid-dev:s390x \
-            libc6-dev:s390x \
-            libcap-ng-dev:s390x \
-            libcurl4-gnutls-dev:s390x \
-            libdbus-1-dev:s390x \
-            libdevmapper-dev:s390x \
-            libfuse-dev:s390x \
-            libgnutls28-dev:s390x \
-            libiscsi-dev:s390x \
-            libncurses5-dev:s390x \
-            libnl-3-dev:s390x \
-            libnl-route-3-dev:s390x \
-            libnuma-dev:s390x \
-            libparted-dev:s390x \
-            libpcap0.8-dev:s390x \
-            libpciaccess-dev:s390x \
-            librbd-dev:s390x \
-            libreadline-dev:s390x \
-            libsanlock-dev:s390x \
-            libsasl2-dev:s390x \
-            libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
-            libssh2-1-dev:s390x \
-            libtirpc-dev:s390x \
-            libudev-dev:s390x \
-            libxml2-dev:s390x \
-            libyajl-dev:s390x \
-            xfslibs-dev:s390x && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-9.Dockerfile b/buildenv-libvirt-debian-9.Dockerfile
deleted file mode 100644
index 9c1e377..0000000
--- a/buildenv-libvirt-debian-9.Dockerfile
+++ /dev/null
@@ -1,90 +0,0 @@
-FROM debian:9
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            glusterfs-common \
-            iproute2 \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libavahi-client-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdbus-1-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libncurses5-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-gcrypt-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libtool \
-            libtool-bin \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            systemtap-sdt-dev \
-            vim \
-            wireshark-dev \
-            xfslibs-dev \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile b/buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile
deleted file mode 100644
index 5c18f5c..0000000
--- a/buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libacl1-dev:arm64 \
-            libapparmor-dev:arm64 \
-            libattr1-dev:arm64 \
-            libaudit-dev:arm64 \
-            libavahi-client-dev:arm64 \
-            libblkid-dev:arm64 \
-            libc6-dev:arm64 \
-            libcap-ng-dev:arm64 \
-            libcurl4-gnutls-dev:arm64 \
-            libdbus-1-dev:arm64 \
-            libdevmapper-dev:arm64 \
-            libfuse-dev:arm64 \
-            libglusterfs-dev:arm64 \
-            libgnutls28-dev:arm64 \
-            libiscsi-dev:arm64 \
-            libncurses-dev:arm64 \
-            libnl-3-dev:arm64 \
-            libnl-route-3-dev:arm64 \
-            libnuma-dev:arm64 \
-            libparted-dev:arm64 \
-            libpcap0.8-dev:arm64 \
-            libpciaccess-dev:arm64 \
-            librbd-dev:arm64 \
-            libreadline-dev:arm64 \
-            libsanlock-dev:arm64 \
-            libsasl2-dev:arm64 \
-            libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
-            libssh2-1-dev:arm64 \
-            libtirpc-dev:arm64 \
-            libudev-dev:arm64 \
-            libxen-dev:arm64 \
-            libxml2-dev:arm64 \
-            libyajl-dev:arm64 \
-            xfslibs-dev:arm64 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
-                    --target=aarch64-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/aarch64-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile b/buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile
deleted file mode 100644
index a7e05e0..0000000
--- a/buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,98 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libacl1-dev:armel \
-            libapparmor-dev:armel \
-            libattr1-dev:armel \
-            libaudit-dev:armel \
-            libavahi-client-dev:armel \
-            libblkid-dev:armel \
-            libc6-dev:armel \
-            libcap-ng-dev:armel \
-            libcurl4-gnutls-dev:armel \
-            libdbus-1-dev:armel \
-            libdevmapper-dev:armel \
-            libfuse-dev:armel \
-            libglusterfs-dev:armel \
-            libgnutls28-dev:armel \
-            libiscsi-dev:armel \
-            libncurses-dev:armel \
-            libnl-3-dev:armel \
-            libnl-route-3-dev:armel \
-            libparted-dev:armel \
-            libpcap0.8-dev:armel \
-            libpciaccess-dev:armel \
-            librbd-dev:armel \
-            libreadline-dev:armel \
-            libsanlock-dev:armel \
-            libsasl2-dev:armel \
-            libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
-            libssh2-1-dev:armel \
-            libtirpc-dev:armel \
-            libudev-dev:armel \
-            libxml2-dev:armel \
-            libyajl-dev:armel \
-            xfslibs-dev:armel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
-                    --target=arm-linux-gnueabi"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabi/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile b/buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile
deleted file mode 100644
index d3bae7f..0000000
--- a/buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libacl1-dev:armhf \
-            libapparmor-dev:armhf \
-            libattr1-dev:armhf \
-            libaudit-dev:armhf \
-            libavahi-client-dev:armhf \
-            libblkid-dev:armhf \
-            libc6-dev:armhf \
-            libcap-ng-dev:armhf \
-            libcurl4-gnutls-dev:armhf \
-            libdbus-1-dev:armhf \
-            libdevmapper-dev:armhf \
-            libfuse-dev:armhf \
-            libglusterfs-dev:armhf \
-            libgnutls28-dev:armhf \
-            libiscsi-dev:armhf \
-            libncurses-dev:armhf \
-            libnl-3-dev:armhf \
-            libnl-route-3-dev:armhf \
-            libparted-dev:armhf \
-            libpcap0.8-dev:armhf \
-            libpciaccess-dev:armhf \
-            librbd-dev:armhf \
-            libreadline-dev:armhf \
-            libsanlock-dev:armhf \
-            libsasl2-dev:armhf \
-            libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
-            libssh2-1-dev:armhf \
-            libtirpc-dev:armhf \
-            libudev-dev:armhf \
-            libxen-dev:armhf \
-            libxml2-dev:armhf \
-            libyajl-dev:armhf \
-            xfslibs-dev:armhf && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
-                    --target=arm-linux-gnueabihf"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/arm-linux-gnueabihf/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-i686.Dockerfile b/buildenv-libvirt-debian-sid-cross-i686.Dockerfile
deleted file mode 100644
index 107292a..0000000
--- a/buildenv-libvirt-debian-sid-cross-i686.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture i386 && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-i686-linux-gnu \
-            libacl1-dev:i386 \
-            libapparmor-dev:i386 \
-            libattr1-dev:i386 \
-            libaudit-dev:i386 \
-            libavahi-client-dev:i386 \
-            libblkid-dev:i386 \
-            libc6-dev:i386 \
-            libcap-ng-dev:i386 \
-            libcurl4-gnutls-dev:i386 \
-            libdbus-1-dev:i386 \
-            libdevmapper-dev:i386 \
-            libfuse-dev:i386 \
-            libglusterfs-dev:i386 \
-            libgnutls28-dev:i386 \
-            libiscsi-dev:i386 \
-            libncurses-dev:i386 \
-            libnl-3-dev:i386 \
-            libnl-route-3-dev:i386 \
-            libnuma-dev:i386 \
-            libparted-dev:i386 \
-            libpcap0.8-dev:i386 \
-            libpciaccess-dev:i386 \
-            librbd-dev:i386 \
-            libreadline-dev:i386 \
-            libsanlock-dev:i386 \
-            libsasl2-dev:i386 \
-            libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
-            libssh2-1-dev:i386 \
-            libtirpc-dev:i386 \
-            libudev-dev:i386 \
-            libxml2-dev:i386 \
-            libyajl-dev:i386 \
-            xfslibs-dev:i386 && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu \
-                    --target=i686-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/i386-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-mips.Dockerfile b/buildenv-libvirt-debian-sid-cross-mips.Dockerfile
deleted file mode 100644
index e0d8ba3..0000000
--- a/buildenv-libvirt-debian-sid-cross-mips.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            libacl1-dev:mips \
-            libapparmor-dev:mips \
-            libattr1-dev:mips \
-            libaudit-dev:mips \
-            libavahi-client-dev:mips \
-            libblkid-dev:mips \
-            libc6-dev:mips \
-            libcap-ng-dev:mips \
-            libcurl4-gnutls-dev:mips \
-            libdbus-1-dev:mips \
-            libdevmapper-dev:mips \
-            libfuse-dev:mips \
-            libglusterfs-dev:mips \
-            libgnutls28-dev:mips \
-            libiscsi-dev:mips \
-            libncurses-dev:mips \
-            libnl-3-dev:mips \
-            libnl-route-3-dev:mips \
-            libnuma-dev:mips \
-            libparted-dev:mips \
-            libpcap0.8-dev:mips \
-            libpciaccess-dev:mips \
-            librbd-dev:mips \
-            libreadline-dev:mips \
-            libsanlock-dev:mips \
-            libsasl2-dev:mips \
-            libselinux1-dev:mips \
-            libssh-gcrypt-dev:mips \
-            libssh2-1-dev:mips \
-            libtirpc-dev:mips \
-            libudev-dev:mips \
-            libxml2-dev:mips \
-            libyajl-dev:mips \
-            xfslibs-dev:mips && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
-                    --target=mips-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile b/buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile
deleted file mode 100644
index 2a2ac79..0000000
--- a/buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libacl1-dev:mips64el \
-            libapparmor-dev:mips64el \
-            libattr1-dev:mips64el \
-            libaudit-dev:mips64el \
-            libavahi-client-dev:mips64el \
-            libblkid-dev:mips64el \
-            libc6-dev:mips64el \
-            libcap-ng-dev:mips64el \
-            libcurl4-gnutls-dev:mips64el \
-            libdbus-1-dev:mips64el \
-            libdevmapper-dev:mips64el \
-            libfuse-dev:mips64el \
-            libglusterfs-dev:mips64el \
-            libgnutls28-dev:mips64el \
-            libiscsi-dev:mips64el \
-            libncurses-dev:mips64el \
-            libnl-3-dev:mips64el \
-            libnl-route-3-dev:mips64el \
-            libnuma-dev:mips64el \
-            libparted-dev:mips64el \
-            libpcap0.8-dev:mips64el \
-            libpciaccess-dev:mips64el \
-            librbd-dev:mips64el \
-            libreadline-dev:mips64el \
-            libsanlock-dev:mips64el \
-            libsasl2-dev:mips64el \
-            libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
-            libssh2-1-dev:mips64el \
-            libtirpc-dev:mips64el \
-            libudev-dev:mips64el \
-            libxml2-dev:mips64el \
-            libyajl-dev:mips64el \
-            xfslibs-dev:mips64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
-                    --target=mips64el-linux-gnuabi64"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mips64el-linux-gnuabi64/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile b/buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile
deleted file mode 100644
index fc8cf85..0000000
--- a/buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libacl1-dev:mipsel \
-            libapparmor-dev:mipsel \
-            libattr1-dev:mipsel \
-            libaudit-dev:mipsel \
-            libavahi-client-dev:mipsel \
-            libblkid-dev:mipsel \
-            libc6-dev:mipsel \
-            libcap-ng-dev:mipsel \
-            libcurl4-gnutls-dev:mipsel \
-            libdbus-1-dev:mipsel \
-            libdevmapper-dev:mipsel \
-            libfuse-dev:mipsel \
-            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 \
-            libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
-            libssh2-1-dev:mipsel \
-            libtirpc-dev:mipsel \
-            libudev-dev:mipsel \
-            libxml2-dev:mipsel \
-            libyajl-dev:mipsel \
-            xfslibs-dev:mipsel && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
-                    --target=mipsel-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/mipsel-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile b/buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile
deleted file mode 100644
index 6c9357d..0000000
--- a/buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libacl1-dev:ppc64el \
-            libapparmor-dev:ppc64el \
-            libattr1-dev:ppc64el \
-            libaudit-dev:ppc64el \
-            libavahi-client-dev:ppc64el \
-            libblkid-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libcap-ng-dev:ppc64el \
-            libcurl4-gnutls-dev:ppc64el \
-            libdbus-1-dev:ppc64el \
-            libdevmapper-dev:ppc64el \
-            libfuse-dev:ppc64el \
-            libglusterfs-dev:ppc64el \
-            libgnutls28-dev:ppc64el \
-            libiscsi-dev:ppc64el \
-            libncurses-dev:ppc64el \
-            libnl-3-dev:ppc64el \
-            libnl-route-3-dev:ppc64el \
-            libnuma-dev:ppc64el \
-            libparted-dev:ppc64el \
-            libpcap0.8-dev:ppc64el \
-            libpciaccess-dev:ppc64el \
-            librbd-dev:ppc64el \
-            libreadline-dev:ppc64el \
-            libsanlock-dev:ppc64el \
-            libsasl2-dev:ppc64el \
-            libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
-            libssh2-1-dev:ppc64el \
-            libtirpc-dev:ppc64el \
-            libudev-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libyajl-dev:ppc64el \
-            xfslibs-dev:ppc64el && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
-                    --target=powerpc64le-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/powerpc64le-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid-cross-s390x.Dockerfile b/buildenv-libvirt-debian-sid-cross-s390x.Dockerfile
deleted file mode 100644
index 917377d..0000000
--- a/buildenv-libvirt-debian-sid-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,99 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libc-dev-bin \
-            libtool \
-            libtool-bin \
-            libxml2-utils \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            vim \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libacl1-dev:s390x \
-            libapparmor-dev:s390x \
-            libattr1-dev:s390x \
-            libaudit-dev:s390x \
-            libavahi-client-dev:s390x \
-            libblkid-dev:s390x \
-            libc6-dev:s390x \
-            libcap-ng-dev:s390x \
-            libcurl4-gnutls-dev:s390x \
-            libdbus-1-dev:s390x \
-            libdevmapper-dev:s390x \
-            libfuse-dev:s390x \
-            libglusterfs-dev:s390x \
-            libgnutls28-dev:s390x \
-            libiscsi-dev:s390x \
-            libncurses-dev:s390x \
-            libnl-3-dev:s390x \
-            libnl-route-3-dev:s390x \
-            libnuma-dev:s390x \
-            libparted-dev:s390x \
-            libpcap0.8-dev:s390x \
-            libpciaccess-dev:s390x \
-            librbd-dev:s390x \
-            libreadline-dev:s390x \
-            libsanlock-dev:s390x \
-            libsasl2-dev:s390x \
-            libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
-            libssh2-1-dev:s390x \
-            libtirpc-dev:s390x \
-            libudev-dev:s390x \
-            libxml2-dev:s390x \
-            libyajl-dev:s390x \
-            xfslibs-dev:s390x && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
-                    --target=s390x-linux-gnu"
-ENV PKG_CONFIG_LIBDIR "/usr/lib/s390x-linux-gnu/pkgconfig"
diff --git a/buildenv-libvirt-debian-sid.Dockerfile b/buildenv-libvirt-debian-sid.Dockerfile
deleted file mode 100644
index 5499f46..0000000
--- a/buildenv-libvirt-debian-sid.Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-FROM debian:sid
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            iproute2 \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libavahi-client-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdbus-1-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libncurses-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-gcrypt-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libtool \
-            libtool-bin \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            strace \
-            sudo \
-            systemtap-sdt-dev \
-            vim \
-            wireshark-dev \
-            xfslibs-dev \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libvirt-fedora-29.Dockerfile b/buildenv-libvirt-fedora-29.Dockerfile
deleted file mode 100644
index bf2bf0a..0000000
--- a/buildenv-libvirt-fedora-29.Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-FROM fedora:29
-
-RUN dnf update -y && \
-    dnf install -y \
-        audit-libs-devel \
-        augeas \
-        autoconf \
-        automake \
-        avahi-devel \
-        bash \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        chrony \
-        cppi \
-        cyrus-sasl-devel \
-        dbus-devel \
-        device-mapper-devel \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        fuse-devel \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glibc-devel \
-        glusterfs-api-devel \
-        gnutls-devel \
-        iproute \
-        iproute-tc \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libtool \
-        libudev-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lsof \
-        lvm2 \
-        make \
-        ncurses-devel \
-        net-tools \
-        netcf-devel \
-        nfs-utils \
-        numactl-devel \
-        numad \
-        parted \
-        parted-devel \
-        patch \
-        perl \
-        pkgconfig \
-        polkit \
-        qemu-img \
-        radvd \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        screen \
-        scrub \
-        sheepdog \
-        strace \
-        sudo \
-        systemtap-sdt-devel \
-        vim \
-        wireshark-devel \
-        xen-devel \
-        xfsprogs-devel \
-        yajl-devel \
-        zfs-fuse && \
-    dnf autoremove -y && \
-    dnf clean all -y
diff --git a/buildenv-libvirt-fedora-30.Dockerfile b/buildenv-libvirt-fedora-30.Dockerfile
deleted file mode 100644
index e9d2365..0000000
--- a/buildenv-libvirt-fedora-30.Dockerfile
+++ /dev/null
@@ -1,89 +0,0 @@
-FROM fedora:30
-
-RUN dnf update -y && \
-    dnf install -y \
-        audit-libs-devel \
-        augeas \
-        autoconf \
-        automake \
-        avahi-devel \
-        bash \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        chrony \
-        cppi \
-        cyrus-sasl-devel \
-        dbus-devel \
-        device-mapper-devel \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        fuse-devel \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glibc-devel \
-        glusterfs-api-devel \
-        gnutls-devel \
-        iproute \
-        iproute-tc \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libtool \
-        libudev-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lsof \
-        lvm2 \
-        make \
-        ncurses-devel \
-        net-tools \
-        netcf-devel \
-        nfs-utils \
-        numactl-devel \
-        numad \
-        parted \
-        parted-devel \
-        patch \
-        perl \
-        pkgconfig \
-        polkit \
-        qemu-img \
-        radvd \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        screen \
-        scrub \
-        sheepdog \
-        strace \
-        sudo \
-        systemtap-sdt-devel \
-        vim \
-        wireshark-devel \
-        xen-devel \
-        xfsprogs-devel \
-        yajl-devel \
-        zfs-fuse && \
-    dnf autoremove -y && \
-    dnf clean all -y
diff --git a/buildenv-libvirt-fedora-rawhide.Dockerfile b/buildenv-libvirt-fedora-rawhide.Dockerfile
deleted file mode 100644
index c618c49..0000000
--- a/buildenv-libvirt-fedora-rawhide.Dockerfile
+++ /dev/null
@@ -1,114 +0,0 @@
-FROM fedora:rawhide
-
-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 \
-        cppi \
-        cyrus-sasl-devel \
-        dbus-devel \
-        device-mapper-devel \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        fuse-devel \
-        gcc \
-        gdb \
-        gettext \
-        gettext-devel \
-        git \
-        glibc-devel \
-        glusterfs-api-devel \
-        gnutls-devel \
-        iproute \
-        iproute-tc \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libtool \
-        libudev-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lsof \
-        lvm2 \
-        make \
-        mingw32-curl \
-        mingw32-dbus \
-        mingw32-dlfcn \
-        mingw32-gcc \
-        mingw32-gettext \
-        mingw32-gnutls \
-        mingw32-libssh2 \
-        mingw32-libxml2 \
-        mingw32-openssl \
-        mingw32-pkg-config \
-        mingw32-portablexdr \
-        mingw32-readline \
-        mingw64-curl \
-        mingw64-dbus \
-        mingw64-dlfcn \
-        mingw64-gcc \
-        mingw64-gettext \
-        mingw64-gnutls \
-        mingw64-libssh2 \
-        mingw64-libxml2 \
-        mingw64-openssl \
-        mingw64-pkg-config \
-        mingw64-portablexdr \
-        mingw64-readline \
-        ncurses-devel \
-        net-tools \
-        netcf-devel \
-        nfs-utils \
-        numactl-devel \
-        numad \
-        parted \
-        parted-devel \
-        patch \
-        perl \
-        pkgconfig \
-        polkit \
-        qemu-img \
-        radvd \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        screen \
-        scrub \
-        sheepdog \
-        strace \
-        sudo \
-        systemtap-sdt-devel \
-        vim \
-        wireshark-devel \
-        xen-devel \
-        xfsprogs-devel \
-        yajl-devel \
-        zfs-fuse && \
-    dnf autoremove -y && \
-    dnf clean all -y
diff --git a/buildenv-libvirt-ubuntu-16.Dockerfile b/buildenv-libvirt-ubuntu-16.Dockerfile
deleted file mode 100644
index 12060a1..0000000
--- a/buildenv-libvirt-ubuntu-16.Dockerfile
+++ /dev/null
@@ -1,91 +0,0 @@
-FROM ubuntu:16.04
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            glusterfs-common \
-            iproute2 \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libavahi-client-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdbus-1-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libncurses-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libopenwsman-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libtool \
-            libtool-bin \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            systemtap-sdt-dev \
-            vim \
-            wireshark-dev \
-            xfslibs-dev \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
diff --git a/buildenv-libvirt-ubuntu-18.Dockerfile b/buildenv-libvirt-ubuntu-18.Dockerfile
deleted file mode 100644
index f5d046f..0000000
--- a/buildenv-libvirt-ubuntu-18.Dockerfile
+++ /dev/null
@@ -1,91 +0,0 @@
-FROM ubuntu:18.04
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-            augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
-            bash \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            chrony \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            gcc \
-            gdb \
-            gettext \
-            git \
-            glusterfs-common \
-            iproute2 \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libavahi-client-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdbus-1-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libncurses5-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libopenwsman-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libtool \
-            libtool-bin \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            lsof \
-            lvm2 \
-            make \
-            net-tools \
-            nfs-common \
-            numad \
-            open-iscsi \
-            parted \
-            patch \
-            perl \
-            pkgconf \
-            policykit-1 \
-            qemu-utils \
-            radvd \
-            screen \
-            scrub \
-            sheepdog \
-            strace \
-            sudo \
-            systemtap-sdt-dev \
-            vim \
-            wireshark-dev \
-            xfslibs-dev \
-            xsltproc \
-            zfs-fuse && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list