From 19c5439510f9d908c0cc48d5b4a321fa9b87f67a Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Fri, 3 Mar 2023 04:50:04 +0000
Subject: [PATCH] ci: simplify and sort

---
 test/container/Dockerfile-Fedora-latest | 65 ++++++++++++-------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/test/container/Dockerfile-Fedora-latest b/test/container/Dockerfile-Fedora-latest
index 623b6cb21..71af5e756 100644
--- a/test/container/Dockerfile-Fedora-latest
+++ b/test/container/Dockerfile-Fedora-latest
@@ -9,50 +9,49 @@ RUN echo 'export DRACUT_NO_XATTR=1 KVERSION=$(cd /lib/modules; ls -1 | tail -1)'
 
 # Install needed packages for the dracut CI container
 RUN dnf -y install --setopt=install_weak_deps=False \
-    dash \
-    pigz \
     asciidoc \
-    mdadm \
-    lvm2 \
-    dmraid \
-    cryptsetup \
-    nfs-utils \
-    nbd \
-    dhcp-server \
-    scsi-target-utils \
-    iscsi-initiator-utils \
-    strace \
+    bash-completion \
     btrfs-progs \
-    kmod-devel \
-    gcc \
     bzip2 \
-    xz \
-    tar \
-    wget \
-    rpm-build \
-    make \
-    git \
-    bash-completion \
-    sudo \
-    kernel \
+    cryptsetup \
+    dash \
+    dbus-daemon \
     dhcp-client \
-    /usr/bin/qemu-kvm \
-    /usr/bin/qemu-system-$(uname -i) \
+    dhcp-server \
+    dmraid \
     e2fsprogs \
-    tcpdump \
+    gcc \
+    git \
     iproute \
     iputils \
-    dbus-daemon \
+    iscsi-initiator-utils \
     kbd \
+    kernel \
+    kmod-devel \
+    lvm2 \
+    make \
+    mdadm \
+    nbd \
     NetworkManager \
-    systemd-networkd \
-    squashfs-tools \
-    which \
+    nfs-utils \
+    ntfsprogs \
+    parted \
+    pigz \
+    qemu-system-x86-core \
+    rpm-build \
+    scsi-target-utils \
     ShellCheck \
     shfmt \
-    parted \
-    ntfsprogs \
-    && dnf -y remove dracut && dnf -y update && dnf -y install --setopt=install_weak_deps=False procps-ng && dnf clean all
+    squashfs-tools \
+    strace \
+    sudo \
+    systemd-networkd \
+    tar \
+    tcpdump \
+    wget \
+    which \
+    xz \
+    && dnf -y remove dracut --noautoremove && dnf -y update && dnf clean all
 
 # Set default command
 CMD ["/usr/bin/bash"]
-- 
2.47.3