From 16b5e37a954e41df94f661bb6e847b6289e5447b Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Sun, 14 Sep 2025 08:37:32 -0400 Subject: [PATCH] ci: remove dhclient from Arch, Debian, Fedora CI The motivation to remove dhclient is to make sure that dracut networking does not need dhclient (when used with network-manager or systemd-networkd). Some distributions (such as Alpine) no longer packages dhclient, which might happen to some of these other distributions as well. --- test/container/Dockerfile-arch | 3 +-- test/container/Dockerfile-debian | 3 +-- test/container/Dockerfile-fedora | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch index 0067e47cd..c115860cc 100644 --- a/test/container/Dockerfile-arch +++ b/test/container/Dockerfile-arch @@ -6,7 +6,7 @@ # - rdma out of tree dracut module # - both dbus-daemon and dbus-broker # - dmraid (not activly maintained) -# - network: network-legacy, network-manager, systemd-networkd +# - network: network-manager, systemd-networkd # Not installed # - busybox (no need, tested elsewhere) @@ -25,7 +25,6 @@ RUN pacman --noconfirm -Syu \ btrfs-progs \ cargo \ cpio \ - dhclient \ dhcp \ dmraid \ dracut \ diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian index e11339fdb..03ed97153 100644 --- a/test/container/Dockerfile-debian +++ b/test/container/Dockerfile-debian @@ -7,7 +7,7 @@ # - zstd compression # - verbose logging for tests # - dbus-daemon -# - network: network-legacy, network-manager, systemd-networkd +# - network: network-manager, systemd-networkd # Not installed # - iscsiuio (iscsiuio.socket missing, see https://bugs.debian.org/1056733) @@ -52,7 +52,6 @@ RUN \ gpg \ iputils-arping \ iputils-ping \ - isc-dhcp-client \ isc-dhcp-server \ jq \ kbd \ diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora index 4c40043a0..e6a1fe348 100644 --- a/test/container/Dockerfile-fedora +++ b/test/container/Dockerfile-fedora @@ -14,7 +14,7 @@ # - fips # - ignition # - dbus-broker -# - network: network-legacy, network-manager +# - network: network-manager ARG DISTRIBUTION=fedora ARG REGISTRY=registry.fedoraproject.org @@ -34,7 +34,6 @@ if [[ "${DISTRIBUTION}" =~ "centos:" ]]; then \ else \ dnf -y install --setopt=install_weak_deps=False \ btrfs-progs \ - dhcp-client \ dhcp-server \ nbd \ qemu \ -- 2.47.3