From: Henrik Gombos <henrik99999@gmail.com>
Date: Wed, 14 Jun 2023 19:17:20 +0000 (+0000)
Subject: ci: add dependencies to Debian container
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcf4665bfcbc910c80eeb244353ca4b9a5254719;p=thirdparty%2Fdracut.git

ci: add dependencies to Debian container

- add systemd-boot-efi for test 18
- tgt is needed for test 30 and 35
- nbd-server is needed for test 40
- gawk dependency has been introduced by f32e95bcadbc5158843530407adc1e7b700561b1
- install dracut instead of initramfs-tools to match actual usage
- remove workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962300
as it is now fixed on Debian 12.
---

diff --git a/test/container/Dockerfile-Debian b/test/container/Dockerfile-Debian
index 5002e1d72..9ba3a1fca 100644
--- a/test/container/Dockerfile-Debian
+++ b/test/container/Dockerfile-Debian
@@ -3,7 +3,10 @@ FROM docker.io/debian:latest
 MAINTAINER https://github.com/dracutdevs/dracut
 
 # Install needed packages for the dracut CI container
-RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
+# Install dracut as a linux-initramfs-tool provider so that the default initramfs-tool package does not get installed
+# Uninstall initramfs-tools-core as a workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994492
+RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --no-install-recommends dracut && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \
     asciidoc \
     astyle \
     btrfs-progs \
@@ -17,11 +20,13 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=nonintera
     dash \
     debhelper \
     debhelper-compat \
+    dmraid \
     docbook \
     docbook-xml \
     docbook-xsl \
     fdisk \
     g++ \
+    gawk \
     git \
     iputils-arping \
     iputils-ping \
@@ -37,6 +42,7 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=nonintera
     mdadm \
     multipath-tools \
     nbd-client \
+    nbd-server \
     network-manager \
     nfs-kernel-server \
     ntfs-3g \
@@ -52,16 +58,10 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=nonintera
     squashfs-tools \
     strace \
     sudo \
+    systemd-boot-efi \
     tcpdump \
+    tgt \
     thin-provisioning-tools \
     vim \
     wget \
-    && apt-get clean
-
-# workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962300
-RUN DEBIAN_FRONTEND=noninteractive apt-get download dmraid \
-    && DEBIAN_FRONTEND=noninteractive dpkg --unpack dmraid*.deb \
-    && rm -rf /var/lib/dpkg/info/dmraid.postinst -f \
-    && DEBIAN_FRONTEND=noninteractive dpkg --configure dmraid \
-    && apt-get install -yf \
-    && apt-get clean
+    && apt-get clean && dpkg -P --force-depends dracut dracut-core initramfs-tools-core