From bf4cb269327c3fe0bc3108244d9d2da709524876 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Thu, 20 Jun 2024 10:01:09 +0200
Subject: [PATCH 1/2] Bump to use latest enki with ukifier

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 tools-image/Dockerfile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tools-image/Dockerfile b/tools-image/Dockerfile
index 85aa1c6..8bd2493 100644
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -1,18 +1,16 @@
 # https://quay.io/repository/kairos/packages?tab=tags&tag=latest
 ARG LEAP_VERSION=15.5
 ARG LUET_VERSION=0.35.2
-ARG ENKI_VERSION=v0.0.32
+ARG ENKI_VERSION=0.1.0
 
 FROM quay.io/luet/base:$LUET_VERSION AS luet
-FROM quay.io/kairos/enki:${ENKI_VERSION} as enki
+FROM quay.io/kairos/enki:v${ENKI_VERSION} as enki
 
 FROM opensuse/leap:$LEAP_VERSION as default
 RUN zypper ref && zypper dup -y
 ## ISO+ Arm image + Netboot + cloud images Build depedencies
 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
@@ -27,11 +25,6 @@ RUN cp /tmp/luet-${TARGETARCH}.yaml /etc/luet/luet.yaml
 ## Uki artifacts, will be set under the /usr/kairos directory
 RUN luet install -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
 RUN luet install -y livecd/grub2-efi-image --system-target /efi

From c49b394e6ce8ce7b4e0c9451dc087a8ed6582eac Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Thu, 20 Jun 2024 10:26:13 +0200
Subject: [PATCH 2/2] Build ostools image on PR as well

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 .github/workflows/tool-image.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tool-image.yml b/.github/workflows/tool-image.yml
index 7b3a527..3a9f871 100644
--- a/.github/workflows/tool-image.yml
+++ b/.github/workflows/tool-image.yml
@@ -2,6 +2,7 @@
 name: 'build tools container images'
 
 on:
+  pull_request:
   push:
     branches:
       - master
@@ -54,8 +55,18 @@ jobs:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_PASSWORD }}
-
       - name: Build
+        if: github.event_name == 'pull_request'
+        uses: docker/build-push-action@v5
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./tools-image
+          file: ./tools-image/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: false
+          tags: ${{ steps.prep.outputs.tags }}
+      - name: Build and push
+        if: github.event_name != 'pull_request'
         uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}