ci: Refresh Dockerfiles and vars files

In this batch: - dnsmasq is dropped as build dependency - Alpine Edge rpcgen package collision fix Signed-off-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2022-04-06 13:14:56 +02:00 · 2022-04-06 13:14:56 +02:00 · cc05c4e5e4
parent 89a95e8bd2
commit cc05c4e5e4
47 changed files with 7 additions and 49 deletions
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl 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 readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub 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 readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl 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 readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub 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 readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl 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 readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub 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 readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/usr/local/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@ -22,7 +22,6 @@ RUN dnf update -y && \
        cyrus-sasl-devel \
        device-mapper-devel \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/alpine-314.Dockerfile
+++ b/ci/containers/alpine-314.Dockerfile
@ -21,7 +21,6 @@ RUN apk update && \
        curl-dev \
        cyrus-sasl-dev \
        diffutils \
-        dnsmasq \
        eudev-dev \
        fuse-dev \
        gcc \
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@ -21,7 +21,6 @@ RUN apk update && \
        curl-dev \
        cyrus-sasl-dev \
        diffutils \
-        dnsmasq \
        eudev-dev \
        fuse-dev \
        gcc \
@ -62,6 +61,7 @@ RUN apk update && \
        python3 \
        qemu-img \
        readline-dev \
+        rpcgen \
        samurai \
        sed \
        util-linux-dev \
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@ -6,7 +6,7 @@

 FROM quay.io/centos/centos:stream8

-RUN dnf update -y && \
+RUN dnf distro-sync -y && \
    dnf install 'dnf-command(config-manager)' -y && \
    dnf config-manager --set-enabled -y powertools && \
    dnf install -y centos-release-advanced-virtualization && \
@ -22,7 +22,6 @@ RUN dnf update -y && \
        cyrus-sasl-devel \
        device-mapper-devel \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@ -6,7 +6,7 @@

 FROM quay.io/centos/centos:stream9

-RUN dnf update -y && \
+RUN dnf distro-sync -y && \
    dnf install 'dnf-command(config-manager)' -y && \
    dnf config-manager --set-enabled -y crb && \
    dnf install -y \
@ -22,7 +22,6 @@ RUN dnf update -y && \
        cyrus-sasl-devel \
        device-mapper-devel \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \
        cyrus-sasl-devel \
        device-mapper-devel \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/fedora-35-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile
@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \
        cpp \
        cppi \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/fedora-35-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile
@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \
        cpp \
        cppi \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/fedora-35.Dockerfile
+++ b/ci/containers/fedora-35.Dockerfile
@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \
        cyrus-sasl-devel \
        device-mapper-devel \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \
        cpp \
        cppi \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \
        cpp \
        cppi \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@ -31,7 +31,6 @@ exec "$@"' > /usr/bin/nosync && \
        cyrus-sasl-devel \
        device-mapper-devel \
        diffutils \
-        dnsmasq \
        dwarves \
        ebtables \
        firewalld-filesystem \
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@ -21,7 +21,6 @@ RUN zypper update -y && \
           cyrus-sasl-devel \
           device-mapper-devel \
           diffutils \
-           dnsmasq \
           dwarves \
           ebtables \
           fuse-devel \
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@ -21,7 +21,6 @@ RUN zypper dist-upgrade -y && \
           cyrus-sasl-devel \
           device-mapper-devel \
           diffutils \
-           dnsmasq \
           dwarves \
           ebtables \
           fuse-devel \
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
            codespell \
            cpp \
            diffutils \
-            dnsmasq-base \
            dwarves \
            ebtables \
            flake8 \