gitlab: re-generate container images from lcitool

This introduces Fedora 33 and removes some redundant packages.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6792accf8f2cbc1c57cd14ccbb5619322609e8e9..f4f6aa8ee90237b40be50eb42961fd64c1e83a31 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,15 +145,15 @@ x64-debian-sid-container:
   variables:
     NAME: debian-sid
 
-x64-fedora-31-container:
+x64-fedora-32-container:
   <<: *container_job_definition
   variables:
-    NAME: fedora-31
+    NAME: fedora-32
 
-x64-fedora-32-container:
+x64-fedora-33-container:
   <<: *container_job_definition
   variables:
-    NAME: fedora-32
+    NAME: fedora-33
 
 x64-fedora-rawhide-container:
   <<: *container_job_definition
@@ -334,20 +334,20 @@ x64-centos-stream:
     NAME: centos-stream
     RPM: skip
 
-x64-fedora-31:
+x64-fedora-32:
   <<: *native_build_job_definition
   needs:
-    - x64-fedora-31-container
+    - x64-fedora-32-container
   variables:
-    NAME: fedora-31
+    NAME: fedora-32
     RPM: skip
 
-x64-fedora-32:
+x64-fedora-33:
   <<: *native_build_job_definition
   needs:
-    - x64-fedora-32-container
+    - x64-fedora-33-container
   variables:
-    NAME: fedora-32
+    NAME: fedora-33
 
 x64-fedora-rawhide:
   <<: *native_build_job_definition

diff --git a/ci/containers/libvirt-centos-7.Dockerfile b/ci/containers/libvirt-centos-7.Dockerfile
index cff225ccc7b908d58c62c7619bd088e56097a525..ea460f76c9a9f93bcf91ba8e761ace63a1977ea7 100644 (file)
--- a/ci/containers/libvirt-centos-7.Dockerfile
+++ b/ci/containers/libvirt-centos-7.Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM registry.centos.org/centos:7
 
 RUN echo -e '[openvz]\n\
 name=OpenVZ addons\n\
@@ -35,14 +35,11 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
     yum install -y \
         audit-libs-devel \
         augeas \
-        autoconf \
-        automake \
         avahi-devel \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cyrus-sasl-devel \
         dbus-devel \
@@ -53,9 +50,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         firewalld-filesystem \
         fuse-devel \
         gcc \
-        gdb \
         gettext \
-        gettext-devel \
         git \
         glib2-devel \
         glibc-common \
@@ -80,16 +75,13 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         libssh-devel \
         libssh2-devel \
         libtirpc-devel \
-        libtool \
         libudev-devel \
         libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lsof \
         lvm2 \
         make \
-        net-tools \
         netcf-devel \
         nfs-utils \
         ninja-build \
@@ -112,15 +104,10 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
         readline-devel \
         rpm-build \
         sanlock-devel \
-        screen \
         scrub \
-        strace \
-        sudo \
         systemtap-sdt-devel \
-        vim \
         wireshark-devel \
         xfsprogs-devel \
-        xz \
         yajl-devel && \
     yum autoremove -y && \
     yum clean all -y && \

diff --git a/ci/containers/libvirt-centos-8.Dockerfile b/ci/containers/libvirt-centos-8.Dockerfile
index 82d2970677468e4ad559bb204d22ad1744eae8a2..633a60dcd464223343f2aaeaeb28a2b6abb735a4 100644 (file)
--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@@ -1,20 +1,18 @@
-FROM centos:8
+FROM registry.centos.org/centos:8
 
 RUN dnf install 'dnf-command(config-manager)' -y && \
     dnf config-manager --set-enabled -y PowerTools && \
+    dnf install -y centos-release-advanced-virtualization && \
     dnf install -y epel-release && \
     dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        autoconf \
-        automake \
         avahi-devel \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cyrus-sasl-devel \
         dbus-devel \
@@ -25,9 +23,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         firewalld-filesystem \
         fuse-devel \
         gcc \
-        gdb \
         gettext \
-        gettext-devel \
         git \
         glib2-devel \
         glibc-devel \
@@ -52,16 +48,13 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         libssh-devel \
         libssh2-devel \
         libtirpc-devel \
-        libtool \
         libudev-devel \
         libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lsof \
         lvm2 \
         make \
-        net-tools \
         netcf-devel \
         nfs-utils \
         ninja-build \
@@ -86,15 +79,10 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
         rpcgen \
         rpm-build \
         sanlock-devel \
-        screen \
         scrub \
-        strace \
-        sudo \
         systemtap-sdt-devel \
-        vim \
         wireshark-devel \
         xfsprogs-devel \
-        xz \
         yajl-devel && \
     dnf autoremove -y && \
     dnf clean all -y && \

diff --git a/ci/containers/libvirt-centos-stream.Dockerfile b/ci/containers/libvirt-centos-stream.Dockerfile
index 12c18759f731bde8727dc5cbe110fda17288ca12..8256e2694478b866c3592634c836011308b8b600 100644 (file)
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@@ -1,21 +1,19 @@
-FROM centos:8
+FROM registry.centos.org/centos:8
 
 RUN dnf install -y centos-release-stream && \
     dnf install 'dnf-command(config-manager)' -y && \
     dnf config-manager --set-enabled -y Stream-PowerTools && \
+    dnf install -y centos-release-advanced-virtualization && \
     dnf install -y epel-release && \
     dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        autoconf \
-        automake \
         avahi-devel \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cyrus-sasl-devel \
         dbus-devel \
@@ -26,9 +24,7 @@ RUN dnf install -y centos-release-stream && \
         firewalld-filesystem \
         fuse-devel \
         gcc \
-        gdb \
         gettext \
-        gettext-devel \
         git \
         glib2-devel \
         glibc-devel \
@@ -53,16 +49,13 @@ RUN dnf install -y centos-release-stream && \
         libssh-devel \
         libssh2-devel \
         libtirpc-devel \
-        libtool \
         libudev-devel \
         libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lsof \
         lvm2 \
         make \
-        net-tools \
         netcf-devel \
         nfs-utils \
         ninja-build \
@@ -87,15 +80,10 @@ RUN dnf install -y centos-release-stream && \
         rpcgen \
         rpm-build \
         sanlock-devel \
-        screen \
         scrub \
-        strace \
-        sudo \
         systemtap-sdt-devel \
-        vim \
         wireshark-devel \
         xfsprogs-devel \
-        xz \
         yajl-devel && \
     dnf autoremove -y && \
     dnf clean all -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
index 0eb01468dd870370268f7caef0197799559a433e..c0ccaad8f24452ab1f0d1064e0f330ce78e98618 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
index b7f434f75ff4aa605794932fcb906523a023ae1e..384ced7c4bac6d77b8161e0c683d00fdffac6eb0 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
index d5388bf214752d6b9e47479822f020f7cf8dc39e..026a6653b6682d71453f2a45213b30bcf9fcf55d 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
index 24f69ac6d448bbeb11ff2a2a0573db107f81ef11..494ed5bc59b4cc23aae6cd5c84e8e41dc3c9d2a0 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
index c0db737669419284b0661b7fb5281241107b8d2f..47d6fc627e5e54235ffd64cb9c859490ebae0d85 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
index d6c51f58ca3b0c52d780e64207d08a915a32ce6c..dfb2fb0342aa6dd86c6dd4f93b2bf20c41a28386 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
index 342de4270bc476c396b86529cd9d60d4eee95530..13d3b7ccbd23eb56f5f599df261b75904dfe5afd 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
index 037adfe4eb90f1f3a36d83b9338d9a0a2fe28f7e..b3a2c506d89b4924764b00c625f5e82adf5a2763 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
index 60012de8f049bcfd93638c64aaa238ae53e4c317..770f79c1326c0557f143adad5256acfe49594d48 100644 (file)
--- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,20 +17,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -51,13 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-10.Dockerfile b/ci/containers/libvirt-debian-10.Dockerfile
index e1d606ace595ba5730d98e70401e97bb3b25a54f..86cca736a70c733f6128270c02dde37bec187e35 100644 (file)
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM docker.io/library/debian:10
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
@@ -58,18 +53,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-gcrypt-dev \
             libssh2-1-dev \
             libtirpc-dev \
-            libtool \
-            libtool-bin \
             libudev-dev \
             libxen-dev \
             libxml2-dev \
             libxml2-utils \
             libyajl-dev \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -86,16 +77,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
             systemtap-sdt-dev \
-            vim \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
index 2efb849c7b1b984f035283fb559c115b6e123906..cf9b9114c91905fdcccbd34c7a6cd09d6fd943b3 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
index 88334eec169eedc0eb455743a5b70b8bc61ee165..407fd06372eede168cd5740a96542f7d8b63b89c 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
index cae91016763e1d3c1975dad94e0092442a552ed2..924bad941f96168f4d6d3842735fb4fdfbfed117 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
index 8aea704897c490a3eb0c575e7d8fbb9c66d6dce5..81fca808090c2c75746615243a94b2ec16b177f9 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
index 713dc1647090c4a1abc5f85c266cfcc48374f038..20e0307b2a5d381c358234df26a1efb009cc801f 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
index c566ab19ae8c0b1f93f00422557bbd5117ad6324..9363cdd8ba717f89ce0419dc3a1cff4621a8b91d 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
index ba3ee5ad70d84b72332dd5b9685485b3fddfd931..3e3311a43bcb02f6458700089b43fe5d5cecc0b4 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
index 9ac88c469acda9abc35c8c032544b8870b92b673..aa04a19a7ab950aedac8a24210315f65c5af2cb8 100644 (file)
--- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,21 +17,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
             kmod \
             libc-dev-bin \
-            libtool \
-            libtool-bin \
             libxml2-utils \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -52,13 +43,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
-            vim \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-debian-sid.Dockerfile b/ci/containers/libvirt-debian-sid.Dockerfile
index fd9b46706f5e0c07480d2df22281a4e99695de15..dd1c52ab474cd3ed1dcde10c1aa429c5c84a8a3d 100644 (file)
--- a/ci/containers/libvirt-debian-sid.Dockerfile
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM docker.io/library/debian:sid
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
@@ -58,19 +53,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-gcrypt-dev \
             libssh2-1-dev \
             libtirpc-dev \
-            libtool \
-            libtool-bin \
             libudev-dev \
             libxen-dev \
             libxml2-dev \
             libxml2-utils \
             libyajl-dev \
             locales \
-            lsof \
             lvm2 \
             make \
             meson \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -87,16 +78,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
             systemtap-sdt-dev \
-            vim \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-fedora-32.Dockerfile b/ci/containers/libvirt-fedora-32.Dockerfile
index 9b10864d72810e4d86c38ba7668c3e223c99bb27..88c181a7460ced22570a84ec1455b762781b3963 100644 (file)
--- a/ci/containers/libvirt-fedora-32.Dockerfile
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -1,17 +1,14 @@
-FROM fedora:32
+FROM registry.fedoraproject.org/fedora:32
 
 RUN dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        autoconf \
-        automake \
         avahi-devel \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cppi \
         cyrus-sasl-devel \
@@ -23,9 +20,7 @@ RUN dnf update -y && \
         firewalld-filesystem \
         fuse-devel \
         gcc \
-        gdb \
         gettext \
-        gettext-devel \
         git \
         glib2-devel \
         glibc-devel \
@@ -50,17 +45,14 @@ RUN dnf update -y && \
         libssh-devel \
         libssh2-devel \
         libtirpc-devel \
-        libtool \
         libudev-devel \
         libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lsof \
         lvm2 \
         make \
         meson \
-        net-tools \
         netcf-devel \
         nfs-utils \
         ninja-build \
@@ -85,17 +77,12 @@ RUN dnf update -y && \
         rpcgen \
         rpm-build \
         sanlock-devel \
-        screen \
         scrub \
         sheepdog \
-        strace \
-        sudo \
         systemtap-sdt-devel \
-        vim \
         wireshark-devel \
         xen-devel \
         xfsprogs-devel \
-        xz \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \

diff --git a/ci/containers/libvirt-fedora-31.Dockerfile b/ci/containers/libvirt-fedora-33.Dockerfile
similarity index 88%
rename from ci/containers/libvirt-fedora-31.Dockerfile
rename to ci/containers/libvirt-fedora-33.Dockerfile
index 6fb77dddc7cf8f3363fa6fe90cd601ba9fc1b0f0..3e4eb21130c273d8f881540fd1d697ec687d0cb9 100644 (file)
--- a/ci/containers/libvirt-fedora-31.Dockerfile
+++ b/ci/containers/libvirt-fedora-33.Dockerfile
@@ -1,17 +1,14 @@
-FROM fedora:31
+FROM registry.fedoraproject.org/fedora:33
 
 RUN dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        autoconf \
-        automake \
         avahi-devel \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cppi \
         cyrus-sasl-devel \
@@ -23,9 +20,7 @@ RUN dnf update -y && \
         firewalld-filesystem \
         fuse-devel \
         gcc \
-        gdb \
         gettext \
-        gettext-devel \
         git \
         glib2-devel \
         glibc-devel \
@@ -50,16 +45,14 @@ RUN dnf update -y && \
         libssh-devel \
         libssh2-devel \
         libtirpc-devel \
-        libtool \
         libudev-devel \
         libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lsof \
         lvm2 \
         make \
-        net-tools \
+        meson \
         netcf-devel \
         nfs-utils \
         ninja-build \
@@ -84,17 +77,12 @@ RUN dnf update -y && \
         rpcgen \
         rpm-build \
         sanlock-devel \
-        screen \
         scrub \
         sheepdog \
-        strace \
-        sudo \
         systemtap-sdt-devel \
-        vim \
         wireshark-devel \
         xen-devel \
         xfsprogs-devel \
-        xz \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \
@@ -103,9 +91,6 @@ RUN dnf update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
 
-RUN pip3 install \
-         meson==0.54.0
-
 ENV LANG "en_US.UTF-8"
 
 ENV MAKE "/usr/bin/make"

diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
index f65bdc13bbf18d0b2533807fbed782e772de23f9..faa155085970d5c50f5891b11e615312150360dd 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
@@ -1,16 +1,13 @@
-FROM fedora:rawhide
+FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     dnf update -y && \
     dnf install -y \
         augeas \
-        autoconf \
-        automake \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cppi \
         dnsmasq \
@@ -18,23 +15,18 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         ebtables \
         firewalld-filesystem \
         gcc \
-        gdb \
-        gettext-devel \
         git \
         glibc-langpack-en \
         iproute \
         iproute-tc \
         iscsi-initiator-utils \
         kmod \
-        libtool \
         libwsman-devel \
         libxml2 \
         libxslt \
-        lsof \
         lvm2 \
         make \
         meson \
-        net-tools \
         nfs-utils \
         ninja-build \
         numad \
@@ -53,13 +45,8 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         radvd \
         rpcgen \
         rpm-build \
-        screen \
         scrub \
         sheepdog \
-        strace \
-        sudo \
-        vim \
-        xz \
         zfs-fuse && \
     dnf autoremove -y && \
     dnf clean all -y && \

diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
index e460123aa5473caddfb0d59534eb8f8a7ac08eab..7def8fd890338ef84f42e900f864dd90ec812667 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
@@ -1,16 +1,13 @@
-FROM fedora:rawhide
+FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     dnf update -y && \
     dnf install -y \
         augeas \
-        autoconf \
-        automake \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cppi \
         dnsmasq \
@@ -18,23 +15,18 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         ebtables \
         firewalld-filesystem \
         gcc \
-        gdb \
-        gettext-devel \
         git \
         glibc-langpack-en \
         iproute \
         iproute-tc \
         iscsi-initiator-utils \
         kmod \
-        libtool \
         libwsman-devel \
         libxml2 \
         libxslt \
-        lsof \
         lvm2 \
         make \
         meson \
-        net-tools \
         nfs-utils \
         ninja-build \
         numad \
@@ -53,13 +45,8 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         radvd \
         rpcgen \
         rpm-build \
-        screen \
         scrub \
         sheepdog \
-        strace \
-        sudo \
-        vim \
-        xz \
         zfs-fuse && \
     dnf autoremove -y && \
     dnf clean all -y && \

diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile b/ci/containers/libvirt-fedora-rawhide.Dockerfile
index 3a995b3c68d11bd067470c76f82b6182e57d2c97..31219df996100d14ef9961acde390cadedb382e4 100644 (file)
--- a/ci/containers/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -1,18 +1,15 @@
-FROM fedora:rawhide
+FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
     dnf update -y && \
     dnf install -y \
         audit-libs-devel \
         augeas \
-        autoconf \
-        automake \
         avahi-devel \
         bash \
         bash-completion \
         ca-certificates \
         ccache \
-        chrony \
         clang \
         cppi \
         cyrus-sasl-devel \
@@ -24,9 +21,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         firewalld-filesystem \
         fuse-devel \
         gcc \
-        gdb \
         gettext \
-        gettext-devel \
         git \
         glib2-devel \
         glibc-devel \
@@ -51,17 +46,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         libssh-devel \
         libssh2-devel \
         libtirpc-devel \
-        libtool \
         libudev-devel \
         libwsman-devel \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lsof \
         lvm2 \
         make \
         meson \
-        net-tools \
         netcf-devel \
         nfs-utils \
         ninja-build \
@@ -86,17 +78,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
         rpcgen \
         rpm-build \
         sanlock-devel \
-        screen \
         scrub \
         sheepdog \
-        strace \
-        sudo \
         systemtap-sdt-devel \
-        vim \
         wireshark-devel \
         xen-devel \
         xfsprogs-devel \
-        xz \
         yajl-devel \
         zfs-fuse && \
     dnf autoremove -y && \

diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile b/ci/containers/libvirt-opensuse-151.Dockerfile
index 7332b1f9fb0fffcda33ad5593226d5698ecca6b2..030581d7ecb5b95bef637b65aa7d8c11a16c1a3b 100644 (file)
--- a/ci/containers/libvirt-opensuse-151.Dockerfile
+++ b/ci/containers/libvirt-opensuse-151.Dockerfile
@@ -1,18 +1,15 @@
-FROM opensuse/leap:15.1
+FROM registry.opensuse.org/opensuse/leap:15.1
 
 RUN zypper update -y && \
     zypper install -y \
            audit-devel \
            augeas \
            augeas-lenses \
-           autoconf \
-           automake \
            avahi-devel \
            bash \
            bash-completion \
            ca-certificates \
            ccache \
-           chrony \
            clang \
            cppi \
            cyrus-sasl-devel \
@@ -23,9 +20,7 @@ RUN zypper update -y && \
            ebtables \
            fuse-devel \
            gcc \
-           gdb \
            gettext \
-           gettext-devel \
            git \
            glib2-devel \
            glibc-devel \
@@ -50,17 +45,14 @@ RUN zypper update -y && \
            libssh-devel \
            libssh2-devel \
            libtirpc-devel \
-           libtool \
            libudev-devel \
            libwsman-devel \
            libxml2 \
            libxml2-devel \
            libxslt \
            libyajl-devel \
-           lsof \
            lvm2 \
            make \
-           net-tools \
            nfs-utils \
            ninja \
            numad \
@@ -84,16 +76,11 @@ RUN zypper update -y && \
            rpcgen \
            rpm-build \
            sanlock-devel \
-           screen \
            scrub \
-           strace \
-           sudo \
            systemtap-sdt-devel \
-           vim \
            wireshark-devel \
            xen-devel \
-           xfsprogs-devel \
-           xz && \
+           xfsprogs-devel && \
     zypper clean --all && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile
index 83ac7ea6ad0aa67ec83adef25afe91ae7b20844d..daa406c2f360ca8d0323c84dec7dadd9e1e4edbd 100644 (file)
--- a/ci/containers/libvirt-ubuntu-1804.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM docker.io/library/ubuntu:18.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             glusterfs-common \
@@ -59,18 +54,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
-            libtool \
-            libtool-bin \
             libudev-dev \
             libxen-dev \
             libxml2-dev \
             libxml2-utils \
             libyajl-dev \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -87,17 +78,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
             sheepdog \
-            strace \
-            sudo \
             systemtap-sdt-dev \
-            vim \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \

diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile b/ci/containers/libvirt-ubuntu-2004.Dockerfile
index 09b213c8baf3119d1df1a4b181b1c23eabed7dbd..dacf7429ff30401bf86542e9aa2585b326f06113 100644 (file)
--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM docker.io/library/ubuntu:20.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -6,14 +6,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install --no-install-recommends -y \
             augeas-lenses \
             augeas-tools \
-            autoconf \
-            automake \
-            autopoint \
             bash \
             bash-completion \
             ca-certificates \
             ccache \
-            chrony \
             clang \
             cpanminus \
             dnsmasq-base \
@@ -21,7 +17,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             ebtables \
             flake8 \
             gcc \
-            gdb \
             gettext \
             git \
             iproute2 \
@@ -59,18 +54,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
-            libtool \
-            libtool-bin \
             libudev-dev \
             libxen-dev \
             libxml2-dev \
             libxml2-utils \
             libyajl-dev \
             locales \
-            lsof \
             lvm2 \
             make \
-            net-tools \
             nfs-common \
             ninja-build \
             numad \
@@ -87,16 +78,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
             python3-wheel \
             qemu-utils \
             radvd \
-            screen \
             scrub \
-            strace \
-            sudo \
             systemtap-sdt-dev \
-            vim \
             wireshark-dev \
             xfslibs-dev \
             xsltproc \
-            xz-utils \
             zfs-fuse && \
     apt-get autoremove -y && \
     apt-get autoclean -y && \