fix: bootloader entries not showing up + dracut not detecting kernels

Signed-off-by: Tulip Blossom <tulilirockz@posteo.com>

Author: tulilirockz

Containerfile

@@ -1,9 +1,9 @@
 FROM docker.io/archlinux/archlinux:latest AS builder
 
-ENV BOOTC_ROOTFS_MOUNTPOINT=/mnt
+ENV DEV_DEPS="base-devel git rust whois"
 
-RUN mkdir -p "${BOOTC_ROOTFS_MOUNTPOINT}/var/lib/pacman" && \
-    pacman -r "${BOOTC_ROOTFS_MOUNTPOINT}" --cachedir=/var/cache/pacman/pkg -Syyuu --noconfirm \
+ENV DRACUT_NO_XATTR=1
+RUN pacman -Syyuu --noconfirm \
       base \
       dracut \
       linux \
@@ -18,14 +18,9 @@ RUN mkdir -p "${BOOTC_ROOTFS_MOUNTPOINT}/var/lib/pacman" && \
       dbus \
       dbus-glib \
       glib2 \
-      pacman \
-      shadow && \
-  cp /etc/pacman.conf "${BOOTC_ROOTFS_MOUNTPOINT}/etc/pacman.conf" && \
-  cp -r /etc/pacman.d "${BOOTC_ROOTFS_MOUNTPOINT}/etc/" && \
-  pacman -S --clean && \
-  rm -rf /var/cache/pacman/pkg/*
-
-RUN pacman -Syu --noconfirm base-devel git rust ostree dracut whois && \
+      ostree \
+      shadow \
+      ${DEV_DEPS} && \
   pacman -S --clean && \
   rm -rf /var/cache/pacman/pkg/*
 
@@ -40,31 +35,29 @@ RUN --mount=type=tmpfs,dst=/tmp --mount=type=tmpfs,dst=/root \
     cargo build --release --bins --features systemd-boot && \
     make install
 
+# Setup a temporary root passwd (changeme) for dev purposes
+# TODO: Replace this for a more robust option when in prod
+RUN usermod -p "$(echo "changeme" | mkpasswd -s)" root
+
+RUN pacman -Rns --noconfirm ${DEV_DEPS}
+
 RUN sh -c 'export KERNEL_VERSION="$(basename "$(find /usr/lib/modules -maxdepth 1 -type d | grep -v -E "*.img" | tail -n 1)")" && \
     dracut --force --no-hostonly --reproducible --zstd --verbose --kver "$KERNEL_VERSION"  "/usr/lib/modules/$KERNEL_VERSION/initramfs.img"'
 
-RUN cd "${BOOTC_ROOTFS_MOUNTPOINT}" && \
-    mkdir -p boot sysroot var/home && \
-    rm -rf var/log home root usr/local srv && \
-    ln -s /var/home home && \
-    ln -s /var/roothome root && \
-    ln -s /var/usrlocal usr/local && \
-    ln -s /var/srv srv
+RUN rm -rf /var /boot /home /root /usr/local /srv && \
+    mkdir -p /var /boot && \
+    ln -s /var/home /home && \
+    ln -s /var/roothome /root && \
+    ln -s /var/srv /srv && \
+    ln -s sysroot/ostree ostree && \
+    ln -s /var/usrlocal /usr/local
 
 # Update useradd default to /var/home instead of /home for User Creation
-RUN sed -i 's|^HOME=.*|HOME=/var/home|' "${BOOTC_ROOTFS_MOUNTPOINT}/etc/default/useradd"
-
-# Setup a temporary root passwd (changeme) for dev purposes
-# TODO: Replace this for a more robust option when in prod
-RUN usermod --root "${BOOTC_ROOTFS_MOUNTPOINT}" -p "$(echo "changeme" | mkpasswd -s)" root
+RUN sed -i 's|^HOME=.*|HOME=/var/home|' "/etc/default/useradd"
 
 # Necessary for `bootc install`
 RUN mkdir -p /usr/lib/ostree && \
     printf  "[composefs]\nenabled = yes\n[sysroot]\nreadonly = true\n" | \
     tee "/usr/lib/ostree/prepare-root.conf"
 
-FROM scratch AS runtime
-
-COPY --from=builder /mnt /
-
 RUN bootc container lint

Justfile

@@ -23,4 +23,4 @@ generate-bootable-image $base_dir=base_dir $filesystem=filesystem:
     if [ ! -e "${base_dir}/bootable.img" ] ; then
         fallocate -l 20G "${base_dir}/bootable.img"
     fi
-    just bootc install to-disk --composefs-native --via-loopback /data/bootable.img --filesystem "${filesystem}" --wipe
+    just bootc install to-disk --composefs-native --via-loopback /data/bootable.img --filesystem "${filesystem}" --wipe --bootloader systemd