ci: allow porting to dnsmasq from isc-dhcp-server

Add dnsmasq to prepare to change the test cases to use dnsmasq.

This is a step towards fixing https://github.com/dracut-ng/dracut-ng/issues/1451.

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index 5a2b9a74f58951163891925aafe3e9bf7a2ff6ee..dee7cc96dfde88d4a07a461e7c2ff6103c5c887c 100644 (file)
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -40,5 +40,6 @@ RUN apk add --no-cache \
 
 # Packages for recent changes that are not yet released or packaged by dracut-tests
 RUN apk add --no-cache \
+    dnsmasq \
     networkmanager-cli \
     networkmanager-initrd-generator

diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch
index c115860ccd56b6daa78ed8eb58fcde58d53f5d2e..6c943c84de476f706de9d1b97fe7194b9e08197f 100644 (file)
--- a/test/container/Dockerfile-arch
+++ b/test/container/Dockerfile-arch
@@ -27,6 +27,7 @@ RUN pacman --noconfirm -Syu \
     cpio \
     dhcp \
     dmraid \
+    dnsmasq \
     dracut \
     elfutils \
     erofs-utils \

diff --git a/test/container/Dockerfile-azurelinux b/test/container/Dockerfile-azurelinux
index c9cac773850f9c6f943c45d187e3bbd1535b867f..da82517e60c9fb0fd3db0d0191521c7eed2a0328 100644 (file)
--- a/test/container/Dockerfile-azurelinux
+++ b/test/container/Dockerfile-azurelinux
@@ -18,6 +18,7 @@ RUN tdnf -y install --setopt=install_weak_deps=False \
     cifs-utils \
     cryptsetup \
     dhcpcd \
+    dnsmasq \
     e2fsprogs \
     fuse3 \
     gcc \

diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian
index 03ed971536a2faa618d308e7d4665ea21336a844..528c7d1215e5284a41b12b585d00c63c1741aea8 100644 (file)
--- a/test/container/Dockerfile-debian
+++ b/test/container/Dockerfile-debian
@@ -42,6 +42,7 @@ RUN \
     cpio \
     cryptsetup \
     curl \
+    dnsmasq \
     docbook \
     docbook-xml \
     docbook-xsl \

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index e6a1fe348aa4cdc80b43daf1fe7f9e180f529d27..8893d9355385a04b4908fab1ce303874daabde0b 100644 (file)
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -49,6 +49,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     cryptsetup \
     crypto-policies-scripts \
     device-mapper-multipath \
+    dnsmasq \
     dracut-live \
     e2fsprogs \
     erofs-utils \

diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo
index ba5508a5598ee757975e980e80b44c39ae79b92d..931844312ecc7ec09d6e2b51cc156b6fdced520e 100644 (file)
--- a/test/container/Dockerfile-gentoo
+++ b/test/container/Dockerfile-gentoo
@@ -47,6 +47,7 @@ emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \
     app-emulation/qemu \
     app-portage/gentoolkit \
     dev-ruby/asciidoctor \
+    net-dns/dnsmasq \
     sys-kernel/dracut \
     sys-kernel/gentoo-kernel-bin \
     sys-libs/libxcrypt \

diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse
index a49a7c3a6d2bd3bb72c3c58fad29b4c8a3952916..8d2d1b7963c94bf99ea8d1267368398257e91f25 100644 (file)
--- a/test/container/Dockerfile-opensuse
+++ b/test/container/Dockerfile-opensuse
@@ -20,6 +20,7 @@ RUN zypper --non-interactive install --no-recommends \
     cryptsetup \
     dhcp-client \
     dhcp-server \
+    dnsmasq \
     distribution-gpg-keys \
     e2fsprogs \
     erofs-utils \

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index 736b30b664ca77a370439a14d7e3d2aef9f4d010..e2e0890ecf1a09488dd4ef1fd14c99a70f2c237f 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -30,6 +30,7 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     cryptsetup \
     dhclient \
     dhcp \
+    dnsmasq \
     e2fsprogs \
     edk2-ovmf \
     elfutils \