[libvirt PATCH 1/3] gitlab: re-generate container images from lcitool

This introduces Fedora 33 and removes some redundant packages. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- .gitlab-ci.yml | 20 +++++++++---------- ci/containers/libvirt-centos-7.Dockerfile | 15 +------------- ci/containers/libvirt-centos-8.Dockerfile | 16 ++------------- .../libvirt-centos-stream.Dockerfile | 16 ++------------- ...libvirt-debian-10-cross-aarch64.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-armv6l.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-armv7l.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-i686.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-mips.Dockerfile | 16 +-------------- ...ibvirt-debian-10-cross-mips64el.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-mipsel.Dockerfile | 16 +-------------- ...libvirt-debian-10-cross-ppc64le.Dockerfile | 16 +-------------- .../libvirt-debian-10-cross-s390x.Dockerfile | 16 +-------------- ci/containers/libvirt-debian-10.Dockerfile | 16 +-------------- ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 16 +-------------- ...libvirt-debian-sid-cross-armv6l.Dockerfile | 16 +-------------- ...libvirt-debian-sid-cross-armv7l.Dockerfile | 16 +-------------- .../libvirt-debian-sid-cross-i686.Dockerfile | 16 +-------------- ...bvirt-debian-sid-cross-mips64el.Dockerfile | 16 +-------------- ...libvirt-debian-sid-cross-mipsel.Dockerfile | 16 +-------------- ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 16 +-------------- .../libvirt-debian-sid-cross-s390x.Dockerfile | 16 +-------------- ci/containers/libvirt-debian-sid.Dockerfile | 16 +-------------- ci/containers/libvirt-fedora-32.Dockerfile | 15 +------------- ...ockerfile => libvirt-fedora-33.Dockerfile} | 19 ++---------------- ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 15 +------------- ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 15 +------------- .../libvirt-fedora-rawhide.Dockerfile | 15 +------------- ci/containers/libvirt-opensuse-151.Dockerfile | 17 ++-------------- ci/containers/libvirt-ubuntu-1804.Dockerfile | 16 +-------------- ci/containers/libvirt-ubuntu-2004.Dockerfile | 16 +-------------- 31 files changed, 44 insertions(+), 455 deletions(-) rename ci/containers/{libvirt-fedora-31.Dockerfile => libvirt-fedora-33.Dockerfile} (88%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6792accf8f..f4f6aa8ee9 100644 --- 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 cff225ccc7..ea460f76c9 100644 --- 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 82d2970677..633a60dcd4 100644 --- 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 12c18759f7..8256e26944 100644 --- 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 0eb01468dd..c0ccaad8f2 100644 --- 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 b7f434f75f..384ced7c4b 100644 --- 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 d5388bf214..026a6653b6 100644 --- 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 24f69ac6d4..494ed5bc59 100644 --- 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 c0db737669..47d6fc627e 100644 --- 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 d6c51f58ca..dfb2fb0342 100644 --- 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 342de4270b..13d3b7ccbd 100644 --- 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 037adfe4eb..b3a2c506d8 100644 --- 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 60012de8f0..770f79c132 100644 --- 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 e1d606ace5..86cca736a7 100644 --- 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 2efb849c7b..cf9b9114c9 100644 --- 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 88334eec16..407fd06372 100644 --- 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 cae9101676..924bad941f 100644 --- 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 8aea704897..81fca80809 100644 --- 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 713dc16470..20e0307b2a 100644 --- 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 c566ab19ae..9363cdd8ba 100644 --- 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 ba3ee5ad70..3e3311a43b 100644 --- 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 9ac88c469a..aa04a19a7a 100644 --- 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 fd9b46706f..dd1c52ab47 100644 --- 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 9b10864d72..88c181a746 100644 --- 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 6fb77dddc7..25aaf0567f 100644 --- a/ci/containers/libvirt-fedora-31.Dockerfile +++ b/ci/containers/libvirt-fedora-33.Dockerfile @@ -1,17 +1,14 @@ -FROM fedora:31 +FROM 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 f65bdc13bb..faa1550859 100644 --- 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 e460123aa5..7def8fd890 100644 --- 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 3a995b3c68..31219df996 100644 --- 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 7332b1f9fb..030581d7ec 100644 --- 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 83ac7ea6ad..daa406c2f3 100644 --- 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 09b213c8ba..dacf7429ff 100644 --- 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 && \ -- 2.28.0