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>

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index 480a40336107bd757efb01473b7914513c64c7cb..e8b06b32e160e09ca2c26d45481dbf5a114ca2aa 100644 (file)
--- 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'

diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index 480a40336107bd757efb01473b7914513c64c7cb..e8b06b32e160e09ca2c26d45481dbf5a114ca2aa 100644 (file)
--- 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'

diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars
index 480a40336107bd757efb01473b7914513c64c7cb..e8b06b32e160e09ca2c26d45481dbf5a114ca2aa 100644 (file)
--- 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'

diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars
index eb6d6db18f4dabb8069a2b77aab5e11fdc196fb9..a5afb4eb4d86b405e9e1249235ef070afcdd6d04 100644 (file)
--- 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'

diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile
index 55ce0908a3074df1b69c2281c384409156c625a0..1b55e9f66f2eec64ad913c3d2b59c3d98d932a2f 100644 (file)
--- 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 \

diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile
index 4ca35a949bda3ddab0aa4bbba8b3d817643d9309..1cd3fc6b0ca8469aa4d5dc6c26ea5a11513d6e4f 100644 (file)
--- 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 \

diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile
index d171ed1be77d9bcbcf446631600a6b42110047df..76e85b4386baa94f858f39e3199611433dfbf3dd 100644 (file)
--- 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 \

diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index 2496c5b0bbff718ab53195c08de79a1a5dca2e56..82cbd7cde7ac19bff44c33238258a2b3ca0cf4b2 100644 (file)
--- 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 \

diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile
index d20602b8476c6a7e3507d35c415ac645b39c5d7d..34ff3a06eb64d4ffcf83dc6a67ab5ba240fc2863 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
index ca6b36b439da7eeb0a062d32d9abeb9fb1bebfcd..f4054490dfd29950fc82f4dd72f68cb4873c82bc 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
index 6818d6c4094960d23cde31c939f25950010176e6..96a6fa94aaa5ad47771477f7b863abb74c40ec9c 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
index 726d5d58461d1cabf1d9221605ece3965d9b3150..d3c221e87add3b319ed5cd80edf907f2a5590529 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
index 16e29e00c9913934a6e08c36c70f7d430ec1ef81..37f4962286c076c1761938263cff23a65344e7e2 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
index d5cabb47c461d6bf9329332d784a8cfb978e17fe..7c8847260fbf799e2146dfa163e3e4e239f440cf 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
index ff63c2b5da3b905ee0ed62240a4b69b5585ed116..0cc7bc7034b99f9ce681e194ba91bc39a8023a1a 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
index 93b68bd10ebaf4e801d91540adb8a12124c3c4c9..ae3fd260eafd675f5f9660efd8d44c06909ada44 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index 5577056754d32baa2ac7ab472e4fd4b198f6024c..7cd3a3a419773168c54bca62c5b488478bcdfbc8 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
index 886d532927587cbac8b7669a4dbe18920473696d..589a5b1d9c55511f0c11ed65419ba3dc1744bd42 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index 63d070cb377235ce1f30ab0100ffd6412d8cea80..41691c708fee98ff8375d62b6eb6de5fa09ff801 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile
index d57a7c0e6e07d2d0133891a1c5ef3eaee49e8678..778eed4be110ac5353f061424d47bb53e0f6cbe1 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile
index cead78f3ca79dd6ed04b57e03d42f25f92ae0e08..6c13a93b95ab132bb27cd4c87d173719da99a29f 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile
index bb3ce1c70c307dcdca71be6448874d3915e5c53f..66f95d5cd8f1999f6391373eda7e6ce870d5d895 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile
index a3408eb6fe5acb25251590e55b12b13fa8fb8333..a12e703f42e253aecc9dff75f0f3d38ba495aa34 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile
index cf28516bb92e3482a6d073dd46518dd62bc6d562..9c880ba1f194d17184871149f5391d2f3325f735 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile
index 535e8a53f1b3af89f5bf85adafa924e88ec4122b..b4d2b53f27e10e1b7bf013219a6276f38b7fb15a 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile
index 147a45c8379d5858238aee1a9131e570056099bd..bd2d62b0bb9fe9fd7504b589db5c06f577039a86 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile
index d3e879b0847e9afe505f60b02c496016ea103dd9..aa73a792102bdd42207f6fd290fa1547557006f0 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile
index 102973de0bd5c7e3274cdf77a6aa9f435d9dd8cb..2609c8392817f3f98e7467261f8abf85060dbbd6 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
index 96f3651e54776cdfee8ec986611b95fbe7382a7a..7e4e5d0b7c594634d3a5ba049b2be1a25b2defa5 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
index 332e0d657029fa27a18415e7c34b19e793acf400..c64bf14f671d64a2d8e5a6cd4cea5b59ecb19e67 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
index 1372fe954d322fed593fe75d15f9e84ad37b044f..81604816f76cbea4f593195e7f6e28283680f0e7 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
index 9557986f1b7561fd70cd24c3ad52739de412660b..4f0f1a992af8472955e6cd1fbfd0141ccd006eba 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
index 0738f5bdad003462592c555cb181d5f5f2dc11e5..c6186a24544d46af8ef6efe85dc37b3ad9423cda 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile
index 8fabe91bfd1fefe33976d8d31b99f153127dbc55..eece32d2dadec8af7cc2619e4133e2bd95a35777 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
index 4b71bba63cac64db826ddf7bc21aef74e935d8e9..1605ca277182bec317c3be19ae7f105ff51ef734 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
index 68f35fc72d91ebfe1daa0ebf0baf5084b0aa86d4..7b5a6b4b793b1ee082905a7ed69f15bf7866d27f 100644 (file)
--- 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 \

diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile
index 0cabbcea66671a9e669aca9901dbde5ebfa60353..52f172441500a0d48bd69f45363e3753efa457b9 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile
index 9153ec2ca1242000c210b4a6b9ac7df11195d542..6949231a6242ffd1e89d6fb20ff81448a0c997b1 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-35-cross-mingw32.Dockerfile
index 01812377028281de616086f5fe6fc3023c45df10..3cc5e7b59b527f690b84ea58a50c8114f1b12ac7 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-35-cross-mingw64.Dockerfile
index 889f32bbfc882ce6cb5646b5fa8420129f3b8266..b6662f6da7ee90905586b9725ab35550366cd620 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile
index 48d22cb0567df9d37e46b20a0139610fab63e5d0..117b2736c395a4912765fd5fe3144fe1eaa7c63c 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 3e474578f0e2e5fc7ba049d8e23dbc131bef403f..5c4a124e339dddacf377058eaaa50d2c86ed35e3 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index a27fb5af4e12f6b2978577fc6bb79fa5d06b7285..7e626a8230c0b27c73ec3771426dc269ff15b757 100644 (file)
--- 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 \

diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index 9615f222304fb50022c5ea0a606dafeed61e3eec..beca9062f5148c01e9a8f2a39b10f8451aa5c4b4 100644 (file)
--- 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 \

diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
index 864dfa4fa7ab9e6f2d47ee2beb066a7ec4f3d397..19161f60cf4b3cd1c185ccc1a3b167c3afb301d4 100644 (file)
--- 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 \

diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index 8f249ccb61a838c198af26b563e0ea0c0ed11407..72824c5505c6a3e8de71b791abc0434d4cc9dea7 100644 (file)
--- 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 \

diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index b6b10f2cbe66b74556bc52307d8d14adf44a8d99..81115ab3383f513536a9f7376f14446e53863a41 100644 (file)
--- 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 \