Introduce RHEL family

.github/flavors.json

@@ -320,7 +320,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "rockylinux",
+        "family": "rhel"
         "flavor": "rockylinux",
         "flavorRelease": "9",
         "variant": "standard",
@@ -330,7 +330,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "rockylinux",
+        "family": "rhel"
         "flavor": "rockylinux",
         "flavorRelease": "9",
         "variant": "core",
@@ -340,7 +340,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "almalinux",
+        "family": "rhel",
         "flavor": "almalinux",
         "flavorRelease": "9",
         "variant": "standard",
@@ -350,7 +350,7 @@
         "worker": "self-hosted"
     },
     {
-        "family": "almalinux",
+        "family": "rhel",
         "flavor": "almalinux",
         "flavorRelease": "9",
         "variant": "core",

Earthfile

@@ -66,6 +66,7 @@ ci:
   ARG --required BASE_IMAGE
   ARG --required MODEL
   ARG --required VARIANT
+  ARG --required FAMILY
 
   BUILD +base-image
   IF [ "$SECURITY_SCANS" = "true" ]
@@ -435,7 +436,7 @@ base-image:
 
     # Set /boot/vmlinuz pointing to our kernel so kairos-agent can use it
     # https://github.com/kairos-io/kairos-agent/blob/0288fb111bc568a1bfca59cb09f39302220475b6/pkg/elemental/elemental.go#L548   q
-    IF [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "rockylinux" ] || [ "$FLAVOR" = "almalinux" ]
+    IF [ "$FLAVOR" = "fedora" ] || [ "$FAMILY" = "rhel" ]
         RUN rm -rf /boot/initramfs-*
     END
 

images/Dockerfile.fedora

@@ -4,12 +4,13 @@ ARG BASE_IMAGE=fedora:latest
 FROM $BASE_IMAGE
 
 RUN echo "install_weak_deps=False" >> /etc/dnf/dnf.conf
+
+RUN dnf update -y
+RUN dnf makecache
 RUN dnf install -y "https://zfsonlinux.org/fedora/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm" && dnf clean all
 RUN dnf install -y \
     audit \
-    coreutils \
     cloud-utils-growpart \
-    curl \
     device-mapper \
     dosfstools \
     dracut \
@@ -48,11 +49,12 @@ RUN dnf install -y \
     which \
     zfs && dnf clean all
 
-RUN mkdir -p /run/lock && \
-  touch /usr/libexec/.keep && \
-  systemctl enable [email protected] && \
-  systemctl enable [email protected] && \
-  systemctl enable [email protected] && \
-  systemctl enable systemd-networkd && \
-  systemctl enable systemd-resolved && \
-  systemctl enable sshd
+RUN mkdir -p /run/lock
+RUN touch /usr/libexec/.keep
+RUN systemctl enable [email protected]
+RUN systemctl enable [email protected]
+RUN systemctl enable [email protected]
+RUN systemctl enable systemd-networkd
+RUN systemctl enable systemd-resolved
+RUN systemctl disable dnf-makecache.service
+RUN systemctl enable sshd

images/Dockerfile.almalinux → images/Dockerfile.rhel

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=almalinux:latest
+ARG BASE_IMAGE
 
 FROM $BASE_IMAGE
 
@@ -7,6 +7,7 @@ RUN echo "install_weak_deps=False" >> /etc/dnf/dnf.conf
 RUN dnf install -y epel-release && dnf clean all
 RUN dnf update -y
 RUN dnf makecache
+RUN dnf install -y "https://zfsonlinux.org/epel/zfs-release-2-3$(rpm --eval "%{dist}").noarch.rpm" && dnf clean all
 RUN dnf install -y \
     audit \
     cloud-utils-growpart \
@@ -19,16 +20,17 @@ RUN dnf install -y \
     dhcp-client \
     e2fsprogs \
     efibootmgr \
-    epel-release \
     gawk \
     gdisk \
     grub2 \
     grub2-efi-x64 \
     grub2-efi-x64-modules \
     grub2-pc \
+    haveged \
     kernel \
     kernel-modules \
     kernel-modules-extra \
+    less \
     livecd-tools \
     lvm2 \
     nano \
@@ -46,7 +48,7 @@ RUN dnf install -y \
     systemd-timesyncd \
     tar \
     which \
-    https://zfsonlinux.org/epel/zfs-release-2-2.el9.noarch.rpm && dnf clean all
+    zfs && dnf clean all
 
 RUN mkdir -p /run/lock
 RUN touch /usr/libexec/.keep