1 files changed, 19 insertions, 3 deletions
diff --git a/templates/bootcblade.containerfile.j2 b/templates/bootcblade.containerfile.j2
index 41a5a6a..a263973 100644
--- a/templates/bootcblade.containerfile.j2
+++ b/templates/bootcblade.containerfile.j2
@@ -1,24 +1,40 @@
 FROM quay.io/centos-bootc/centos-bootc:{{ centos_bootc_tag if centos_bootc_tag is defined else 'stream9' }}
+
+# Create root homedir
 RUN mkdir /var/roothome
-RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/wheel-passwordless-sudo
+
+# ZFS
 RUN dnf -y install epel-release && \
     dnf -y install https://zfsonlinux.org/epel/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm && \
     dnf -y install kernel-devel-$(ls /usr/lib/modules) && \
     dnf -y install zfs && \
     dkms build zfs/$(rpm -q --qf '%{VERSION}' zfs) -k $(ls /usr/lib/modules) && \
     dkms install zfs/$(rpm -q --qf '%{VERSION}' zfs) -k $(ls /usr/lib/modules)
-RUN dnf -y install vim git podman fish ansible wget dstat byobu && \
-    echo "qemu:x:107:107:qemu user:/:/sbin/nologin" >> /etc/passwd && \
+
+# KVM & Cockpit
+RUN echo "qemu:x:107:107:qemu user:/:/sbin/nologin" >> /etc/passwd && \
     dnf -y install qemu-kvm libvirt virt-install virt-viewer && \
     dnf -y install cockpit cockpit-bridge cockpit-file-sharing cockpit-machines cockpit-pcp cockpit-podman cockpit-storaged cockpit-system
+
+# Cockpit ZFS Manager
 RUN git clone https://github.com/45drives/cockpit-zfs-manager.git /root/cockpit-zfs-manager && \
     cp -r /root/cockpit-zfs-manager/zfs /usr/share/cockpit && \
     rm -r /root/cockpit-zfs-manager
+
+# Sanoid & Syncoid
 RUN git clone https://github.com/jimsalterjrs/sanoid.git /root/sanoid && \
     cd /root/sanoid && git checkout $(git tag | grep "^v" | tail -n 1) && cp sanoid syncoid findoid sleepymutex /usr/local/sbin && \
     mkdir /etc/sanoid && cp sanoid.defaults.conf /etc/sanoid && touch /etc/sanoid/sanoid.conf && cp sanoid.conf /etc/sanoid/sanoid.example.conf && \
     rm -r /root/sanoid
 RUN dnf -y install perl-Data-Dumper perl-Getopt-Long lzop mbuffer mhash pv && \
     PERL_MM_USE_DEFAULT=1 cpan install Capture::Tiny && PERL_MM_USE_DEFAULT=1 cpan install Config::IniFiles
+
+# Firewall
 RUN dnf -y install firewalld && \
     systemctl enable firewalld
+
+# Allow sudo without password
+RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/wheel-passwordless-sudo
+
+# Other tools
+RUN dnf -y install vim git podman fish ansible wget dstat byobu smartmontools