From b340df890d6859a1def6cdc53a852ef2fb50d231 Mon Sep 17 00:00:00 2001
From: Seraphim Strub <sst@rievo.net>
Date: Mon, 31 Mar 2025 17:53:45 +0000
Subject: [PATCH] chore: refactoring

---
 .forgejo/workflows/build.yml |  4 ++--
 Containerfile                | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index ee21e25..5c44030 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -166,8 +166,8 @@ jobs:
           tags: ${{ steps.metadata.outputs.tags }}
           username: ${{ env.REGISTRY_USER }}
           password: ${{ env.REGISTRY_PASSWORD }}
-          extra-args:
-            --compression-format zstd:chunked
+          #     extra-args:
+          # --compression-format zstd:chunked
       
 
       # This section is optional and only needs to be enabled if you plan on distributing
diff --git a/Containerfile b/Containerfile
index 208fb09..5f5184a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -11,6 +11,7 @@ RUN <<EOF
 
     dnf install --assumeyes 'dnf5-command(config-manager)'
     dnf config-manager setopt exclude=PackageKit,PackageKit-command-not-found,rootfiles,firefox
+    dnf config-manager setopt install_weak_deps=False
 
     dnf install --assumeyes @sway-desktop-environment
 
@@ -18,15 +19,17 @@ RUN <<EOF
 
     dnf clean all
 
-    QUALIFIED_KERNEL="$(rpm --query --all | grep --perl-regexp 'kernel-(\d+\.\d+\.\d+)' | sed --regexp-extended 's/kernel-//')"
-    dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible --verbose --add ostree --force "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+    QUALIFIED_KERNEL="$(dnf repoquery --installed --queryformat='%{evr}.%{arch}' kernel)"
+    dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible --verbose --add ostree --zstd --force "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
 
+    rm --force --recursive /tmp/* /var/*
+    mkdir --parents /var/tmp
+    chmod --recursive 1777 /var/tmp
+
+    ostree container commit
+    bootc container lint
 EOF
 
 #enable desired units
 #RUN systemctl enable lm_sensors sysstat tuned fstrim.timer podman.socket podman-auto-update.timer cockpit.socket
 
-RUN rm --force --recursive /tmp/* /var/* && \
-    mkdir --parents /var/tmp && chmod --recursive 1777 /var/tmp && \
-    ostree container commit && \
-    bootc container lint || true