Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- ci/cirrus/freebsd-12.vars | 6 +++--- ci/cirrus/freebsd-13.vars | 6 +++--- ci/cirrus/freebsd-current.vars | 6 +++--- ci/cirrus/macos-11.vars | 2 +- ci/containers/centos-8.Dockerfile | 3 +-- ci/containers/centos-stream-8.Dockerfile | 3 +-- ci/containers/debian-10-cross-aarch64.Dockerfile | 6 ++---- ci/containers/debian-10-cross-armv6l.Dockerfile | 6 ++---- ci/containers/debian-10-cross-armv7l.Dockerfile | 6 ++---- ci/containers/debian-10-cross-i686.Dockerfile | 6 ++---- ci/containers/debian-10-cross-mips.Dockerfile | 6 ++---- ci/containers/debian-10-cross-mips64el.Dockerfile | 6 ++---- ci/containers/debian-10-cross-mipsel.Dockerfile | 6 ++---- ci/containers/debian-10-cross-ppc64le.Dockerfile | 6 ++---- ci/containers/debian-10-cross-s390x.Dockerfile | 6 ++---- ci/containers/debian-10.Dockerfile | 6 ++---- ci/containers/debian-sid-cross-aarch64.Dockerfile | 3 +-- ci/containers/debian-sid-cross-armv6l.Dockerfile | 3 +-- ci/containers/debian-sid-cross-armv7l.Dockerfile | 3 +-- ci/containers/debian-sid-cross-i686.Dockerfile | 3 +-- ci/containers/debian-sid-cross-mips64el.Dockerfile | 3 +-- ci/containers/debian-sid-cross-mipsel.Dockerfile | 3 +-- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 3 +-- ci/containers/debian-sid-cross-s390x.Dockerfile | 3 +-- ci/containers/debian-sid.Dockerfile | 3 +-- ci/containers/fedora-33.Dockerfile | 3 +-- ci/containers/fedora-34.Dockerfile | 3 +-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 3 +-- ci/containers/opensuse-leap-152.Dockerfile | 3 +-- ci/containers/opensuse-tumbleweed.Dockerfile | 3 +-- ci/containers/ubuntu-1804.Dockerfile | 3 +-- ci/containers/ubuntu-2004.Dockerfile | 3 +-- 34 files changed, 50 insertions(+), 88 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 914ad417b9..36bcc522dc 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-12 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' +PIP3='/usr/local/bin/pip-3.8' +PKGS='augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 58c18a2f36..8a86f55237 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-13 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' +PIP3='/usr/local/bin/pip-3.8' +PKGS='augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 1a5ac52cf9..d308986384 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-current libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' -PKGS='augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' +PIP3='/usr/local/bin/pip-3.8' +PKGS='augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 73402bab8f..1da29e9ed6 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,7 +2,7 @@ # # $ lcitool variables macos-11 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/a47008f1a77f92176b30729480347bdf0f372068 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='brew' CCACHE='/usr/local/bin/ccache' diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index 9358e69b0c..2667e5f4f8 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/centos:8 @@ -14,7 +14,6 @@ RUN dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 3355374e67..f89f7648fe 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM quay.io/centos/centos:stream8 @@ -14,7 +14,6 @@ RUN dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index 7d10b93d06..b81a3f123e 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:arm64 \ libattr1-dev:arm64 \ libaudit-dev:arm64 \ - libavahi-client-dev:arm64 \ libblkid-dev:arm64 \ libc6-dev:arm64 \ libcap-ng-dev:arm64 \ diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index 25057ea993..dcfb73d83a 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:armel \ libattr1-dev:armel \ libaudit-dev:armel \ - libavahi-client-dev:armel \ libblkid-dev:armel \ libc6-dev:armel \ libcap-ng-dev:armel \ diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index ef880ac0fe..f125fc1789 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:armhf \ libattr1-dev:armhf \ libaudit-dev:armhf \ - libavahi-client-dev:armhf \ libblkid-dev:armhf \ libc6-dev:armhf \ libcap-ng-dev:armhf \ diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 5826866c2d..fe9f9e3a6d 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:i386 \ libattr1-dev:i386 \ libaudit-dev:i386 \ - libavahi-client-dev:i386 \ libblkid-dev:i386 \ libc6-dev:i386 \ libcap-ng-dev:i386 \ diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index aaa2df47a8..c1b441de40 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:mips \ libattr1-dev:mips \ libaudit-dev:mips \ - libavahi-client-dev:mips \ libblkid-dev:mips \ libc6-dev:mips \ libcap-ng-dev:mips \ diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index d3f25791a3..bdce689148 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:mips64el \ libattr1-dev:mips64el \ libaudit-dev:mips64el \ - libavahi-client-dev:mips64el \ libblkid-dev:mips64el \ libc6-dev:mips64el \ libcap-ng-dev:mips64el \ diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index cc9142aa72..0bfa1e0552 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:mipsel \ libattr1-dev:mipsel \ libaudit-dev:mipsel \ - libavahi-client-dev:mipsel \ libblkid-dev:mipsel \ libc6-dev:mipsel \ libcap-ng-dev:mipsel \ diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index ce68bbb19f..08cc080f8a 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:ppc64el \ libattr1-dev:ppc64el \ libaudit-dev:ppc64el \ - libavahi-client-dev:ppc64el \ libblkid-dev:ppc64el \ libc6-dev:ppc64el \ libcap-ng-dev:ppc64el \ diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index 773f04933f..62f0584129 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -50,8 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ radvd \ scrub \ sed \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -72,7 +71,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:s390x \ libattr1-dev:s390x \ libaudit-dev:s390x \ - libavahi-client-dev:s390x \ libblkid-dev:s390x \ libc6-dev:s390x \ libcap-ng-dev:s390x \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 119a77bb09..211442c673 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ @@ -90,8 +89,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ systemtap-sdt-dev \ wireshark-dev \ xfslibs-dev \ - xsltproc \ - zfs-fuse && \ + xsltproc && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 736414b179..3dcba9038a 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:arm64 \ libattr1-dev:arm64 \ libaudit-dev:arm64 \ - libavahi-client-dev:arm64 \ libblkid-dev:arm64 \ libc6-dev:arm64 \ libcap-ng-dev:arm64 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index b4304a7f32..34255cd3b0 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:armel \ libattr1-dev:armel \ libaudit-dev:armel \ - libavahi-client-dev:armel \ libblkid-dev:armel \ libc6-dev:armel \ libcap-ng-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index e4db402bc9..8ec54bdee1 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:armhf \ libattr1-dev:armhf \ libaudit-dev:armhf \ - libavahi-client-dev:armhf \ libblkid-dev:armhf \ libc6-dev:armhf \ libcap-ng-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 983cd2a336..555e36d014 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:i386 \ libattr1-dev:i386 \ libaudit-dev:i386 \ - libavahi-client-dev:i386 \ libblkid-dev:i386 \ libc6-dev:i386 \ libcap-ng-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index e568b46d60..20478e1f02 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:mips64el \ libattr1-dev:mips64el \ libaudit-dev:mips64el \ - libavahi-client-dev:mips64el \ libblkid-dev:mips64el \ libc6-dev:mips64el \ libcap-ng-dev:mips64el \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index cf24c09244..abf0642bd6 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:mipsel \ libattr1-dev:mipsel \ libaudit-dev:mipsel \ - libavahi-client-dev:mipsel \ libblkid-dev:mipsel \ libc6-dev:mipsel \ libcap-ng-dev:mipsel \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 40be4130af..a339905329 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:ppc64el \ libattr1-dev:ppc64el \ libaudit-dev:ppc64el \ - libavahi-client-dev:ppc64el \ libblkid-dev:ppc64el \ libc6-dev:ppc64el \ libcap-ng-dev:ppc64el \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index e0b7dff94a..c29bb57d88 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev:s390x \ libattr1-dev:s390x \ libaudit-dev:s390x \ - libavahi-client-dev:s390x \ libblkid-dev:s390x \ libc6-dev:s390x \ libcap-ng-dev:s390x \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 454d726465..cb6a24cb50 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index aed94d1256..7350de493f 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:33 @@ -20,7 +20,6 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index 53a5d67b3f..10a19a8f51 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-34 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:34 @@ -20,7 +20,6 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 93a57b3277..48c4dd3642 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:rawhide diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index ed16d75479..38fb9a6aeb 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:rawhide diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 79bacbcc95..b36fb9343e 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:rawhide @@ -21,7 +21,6 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index b5f7e5f54e..abe3e57185 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-leap-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.opensuse.org/opensuse/leap:15.2 @@ -11,7 +11,6 @@ RUN zypper update -y && \ audit-devel \ augeas \ augeas-lenses \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 9f49fdabfd..18b136fe03 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-tumbleweed libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.opensuse.org/opensuse/tumbleweed:latest @@ -11,7 +11,6 @@ RUN zypper update -y && \ audit-devel \ augeas \ augeas-lenses \ - avahi-devel \ bash-completion \ ca-certificates \ ccache \ diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 5e4a2e0b8f..21b73e62aa 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/ubuntu:18.04 @@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 0e2790f03f..5654ad003f 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a9dc4dc3c9d06f0 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/ubuntu:20.04 @@ -34,7 +34,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libapparmor-dev \ libattr1-dev \ libaudit-dev \ - libavahi-client-dev \ libblkid-dev \ libc-dev-bin \ libc6-dev \ -- 2.31.1
