WIP

Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Oct 11, 2023 · 57858cb · 57858cb
1 parent c13dc2a
commit 57858cb
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 66 deletions.
diff --git a/.github/flavors.json b/.github/flavors.json
@@ -91,7 +91,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-20.04",
+        "flavor": "ubuntu-20-04",
         "variant": "standard",
         "model": "generic",
         "baseImage": "ubuntu:20.04",
@@ -101,7 +101,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-20.04",
+        "flavor": "ubuntu-20-04",
         "variant": "core",
         "model": "generic",
         "baseImage": "ubuntu:20.04",
@@ -111,7 +111,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-20.04",
+        "flavor": "ubuntu-20-04",
         "variant": "standard",
         "model": "rpi4",
         "baseImage": "ubuntu:20.04",
@@ -121,7 +121,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-20.04",
+        "flavor": "ubuntu-20-04",
         "variant": "core",
         "model": "rpi4",
         "baseImage": "ubuntu:20.04",
@@ -131,7 +131,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-22.04",
+        "flavor": "ubuntu-22-04",
         "variant": "standard",
         "model": "generic",
         "baseImage": "ubuntu:22.04",
@@ -141,7 +141,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-22.04",
+        "flavor": "ubuntu-22-04",
         "variant": "core",
         "model": "generic",
         "baseImage": "ubuntu:22.04",
@@ -151,7 +151,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-22.04",
+        "flavor": "ubuntu-22-04",
         "variant": "standard",
         "model": "rpi4",
         "baseImage": "ubuntu:22.04",
@@ -161,7 +161,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-22.04",
+        "flavor": "ubuntu-22-04",
         "variant": "core",
         "model": "rpi4",
         "baseImage": "ubuntu:22.04",
@@ -171,7 +171,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-23.04",
+        "flavor": "ubuntu-23-04",
         "variant": "standard",
         "model": "generic",
         "baseImage": "ubuntu:23.04",
@@ -181,7 +181,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-23.04",
+        "flavor": "ubuntu-23-04",
         "variant": "core",
         "model": "generic",
         "baseImage": "ubuntu:23.04",
@@ -191,7 +191,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-23.04",
+        "flavor": "ubuntu-23-04",
         "variant": "standard",
         "model": "rpi4",
         "baseImage": "ubuntu:23.04",
@@ -201,7 +201,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-23.04",
+        "flavor": "ubuntu-23-04",
         "variant": "core",
         "model": "rpi4",
         "baseImage": "ubuntu:23.04",
@@ -211,7 +211,7 @@
     },
     {
         "family": "ubuntu",
-        "flavor": "ubuntu-23.04",
+        "flavor": "ubuntu-23-04",
         "variant": "core",
         "model": "generic",
         "baseImage": "ubuntu:23.04",
@@ -381,7 +381,7 @@
     },
     {
         "family": "nvidia",
-        "flavor": "ubuntu-20.04",
+        "flavor": "ubuntu-20-04",
         "variant": "core",
         "model": "nvidia-jetson-agx-orin",
         "baseImage": "ubuntu:20.04",

diff --git a/framework-profile.yaml b/framework-profile.yaml
@@ -7,67 +7,42 @@
 # images:
 #   - quay.io/kairos/packages:k9s-utils-0.27.4
 flavors:
-  debian:
+  debian-testing:
     - common-packages
     - kairos-toolchain
     - systemd-base
     - dracut-network-legacy
-  debian-arm-rpi:
+  debian-bookworm:
     - common-packages
     - kairos-toolchain
     - systemd-base
-    - dracut-network-legacy
-  ubuntu:
-    - common-packages
-    - kairos-toolchain
-    - systemd-base
-    - dracut-network-legacy
-  ubuntu-arm-rpi:
-    - common-packages
-    - kairos-toolchain
-    - systemd-base
-    - dracut-network-legacy
-  ubuntu-20-lts-arm-nvidia-jetson-agx-orin:
+    - dracut-nettork-legacy
+  ubuntu-20-04:
     - common-packages
     - kairos-toolchain
     - systemd-base
     - dracut-network-legacy-compat
-  ubuntu-20-lts-arm-rpi:
+  ubuntu-22-04:
     - common-packages
     - kairos-toolchain
     - systemd-base
     - dracut-network-legacy-compat
-  ubuntu-22-lts-arm-rpi:
+  ubuntu-23-04:
     - common-packages
     - kairos-toolchain
     - systemd-base
-    - dracut-network-legacy-compat
-  ubuntu-22-lts:
-    - common-packages
-    - kairos-toolchain
-    - systemd-base
-    - dracut-network-legacy-compat
-  ubuntu-20-lts:
-    - common-packages
-    - kairos-toolchain
-    - systemd-base
-    - dracut-network-legacy-compat
-  fips-systemd:
-    - common-packages
-    - kairos-toolchain-fips
-    - systemd-base
-    - dracut-network-legacy-compat
-  fedora:
+    - dracut-network-legacy
+  fedora-38:
     - common-packages
     - kairos-toolchain
     - systemd-base
     - dracut-network-legacy-compat
-  rockylinux:
+  rockylinux-9:
     - common-packages
     - kairos-toolchain
     - systemd-base
     - dracut-network-legacy-compat
-  almalinux:
+  almalinux-9:
     - common-packages
     - kairos-toolchain
     - systemd-base
@@ -78,29 +53,12 @@ flavors:
     - systemd-base
     - systemd-latest
     - dracut-network-legacy
-  opensuse-tumbleweed-arm-rpi:
-    - common-packages
-    - kairos-toolchain
-    - systemd-base
-    - systemd-latest
-    - dracut-network-legacy
   opensuse-leap:
     - common-packages
     - kairos-toolchain
     - systemd-base
     - systemd-latest
     - dracut-network-legacy
-  opensuse-leap-arm-rpi:
-    - common-packages
-    - kairos-toolchain
-    - systemd-base
-    - systemd-latest
-    - dracut-network-legacy
-  alpine-arm-rpi:
-    - common-packages
-    - kairos-toolchain
-    - opensuse-leap-kernel
-    - openrc
   alpine-opensuse-leap:
     - common-packages
     - kairos-toolchain
@@ -111,6 +69,12 @@ flavors:
     - kairos-toolchain
     - ubuntu-kernel
     - openrc
+  # TODO: This is only for the fips framework image. Find another way.
+  # fips-systemd:
+  #   - common-packages
+  #   - kairos-toolchain-fips
+  #   - systemd-base
+  #   - dracut-network-legacy-compat
 # See https://github.com/kairos-io/packages/pull/67 for rationale
 dracut-network-legacy:
   packages:

diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -34,6 +34,7 @@ FROM ${BASE_IMAGE} AS ubuntu-22-04-upstream
 ###############################################################
 FROM ${FLAVOR}-upstream AS common
 ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
     gnupg \
@@ -247,3 +248,24 @@ RUN systemctl enable ssh
 RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
 
 RUN journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
+
+# TODO: Consider installing luet packages here and skipping framework image altogether
+#
+# # Setup luet
+# COPY --from=quay.io/luet/base:latest /usr/bin/luet /usr/bin/luet
+# COPY framework-profile.yaml /etc/luet/luet.yaml
+
+# # Install luet packages
+# RUN luet install -y \
+#   static/grub-config \
+#   dracut/immucore \
+#   system/suc-upgrade \
+#   system/grub2-efi \
+#   static/kairos-overlay-files \
+#   system/kcrypt \
+#   system/kcrypt-challenger \
+#   system/immucore \
+#   system/kairos-agent \
+#   init-svc/systemd \
+#   dracut/network-legacy-compat
+