From 7813c2eec45a1db8ff9b1283ed2c9fa73e4cf878 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Mon, 19 Feb 2024 15:19:41 +0100
Subject: [PATCH] Revert to using leap as base image for tool image

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 tools-image/Dockerfile      | 21 +++++++++------------
 tools-image/luet-amd64.yaml |  2 +-
 tools-image/luet-arm64.yaml |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile
index bb4a9fa..27c2b8b 100644
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -1,23 +1,18 @@
 # https://quay.io/repository/kairos/packages?tab=tags&tag=latest
-ARG FEDORA_VERSION=40
+ARG LEAP_VERSION=15.5
 ARG LUET_VERSION=0.35.0
 ARG ENKI_VERSION=v0.0.17-rc2
 
 FROM quay.io/luet/base:$LUET_VERSION AS luet
 FROM quay.io/kairos/enki:${ENKI_VERSION} as enki
 
-FROM fedora:$FEDORA_VERSION as default
-RUN dnf -y update
+FROM opensuse/leap:$LEAP_VERSION as default
+RUN zypper ref && zypper dup -y
 ## ISO+ Arm image + Netboot + cloud images Build depedencies
-RUN dnf in -y bc qemu-tools jq genisoimage docker git curl gdisk kpartx sudo xfsprogs parted e2fsprogs curl  \
-    util-linux udev rsync grub2 dosfstools mtools xorriso lvm2 zstd sbsigntools squashfs-tools openssl \
-    python3-cryptography python3-pefile # ukify deps
-# systemd-ukify systemd-boot
-# Install grub2-efi-x64 only on x86 arches
-RUN if [ "$(uname -m)" == "x86_64" ]; then dnf install -y grub2-efi-x64; fi
-# Install grub2-efi-arm64 only on arm64 arches
-RUN if [ "$(uname -m)" == "aarch64" ]; then dnf install -y grub2-efi-aa64; fi
-
+RUN zypper ref && zypper in -y bc qemu-tools jq cdrtools docker git curl gptfdisk kpartx sudo xfsprogs parted  \
+    util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2 zstd
+RUN zypper in -y python311-pip python311-cryptography sbsigntools tpm2-* # ukify deps
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1  # make python3.11 the default python3 for ukify
 COPY --from=luet /usr/bin/luet /usr/bin/luet
 ENV LUET_NOLOCK=true
 ENV TMPDIR=/tmp
@@ -35,6 +30,8 @@ RUN luet install --config /tmp/luet-amd64.yaml -y system/systemd-boot
 RUN luet install --config /tmp/luet-arm64.yaml -y system/systemd-boot
 # ukify + measure
 RUN luet install -y system/systemd-ukify
+# ukify deps that are not in the suse repos as packages. ukify package provides this so we have the exact versions needed
+RUN pip3 install -r /usr/kairos/ukify-requirements.txt
 
 ## Live CD artifacts
 RUN luet install -y livecd/grub2 --system-target /grub2
diff --git a/tools-image/luet-amd64.yaml b/tools-image/luet-amd64.yaml
index 320929f..ee4f887 100644
--- a/tools-image/luet-amd64.yaml
+++ b/tools-image/luet-amd64.yaml
@@ -12,4 +12,4 @@ repositories:
     priority: 2
     urls:
       - "quay.io/kairos/packages"
-    reference: 20240215113356-repository.yaml
+    reference: 20240219135130-repository.yaml
diff --git a/tools-image/luet-arm64.yaml b/tools-image/luet-arm64.yaml
index b90a7a5..7fcf8a3 100644
--- a/tools-image/luet-arm64.yaml
+++ b/tools-image/luet-arm64.yaml
@@ -12,4 +12,4 @@ repositories:
     priority: 2
     urls:
       - "quay.io/kairos/packages-arm64"
-    reference: 20240215133500-repository.yaml
+    reference: 20240219145903-repository.yaml