From 32f25c02e6a4b24695b2623dc001f5ab6c63080a Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge@hallyn.com>
Date: Tue, 21 Nov 2023 13:39:13 -0600
Subject: [PATCH] bump mos to v0.0.26

Signed-off-by: Serge Hallyn <serge@hallyn.com>
---
 .github/workflows/build.yml | 8 ++++++--
 layers/mos/stacker.yaml     | 2 +-
 subs.mk                     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3015147..c522c28 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,12 @@ jobs:
       - name: Prepare environment
         run: |
           sudo add-apt-repository -y ppa:project-machine/squashfuse
-          sudo apt-get install ovmf pip squashfuse
+          sudo apt-get install mtools ovmf pip squashfuse
           sudo pip install virt-firmware
+          sudo wget --progress=dot:mega -O /usr/bin/zot \
+              https://github.com/project-zot/zot/releases/download/v2.0.0-rc5/zot-linux-amd64-minimal
+          sudo chmod 755 /usr/bin/zot
+          which zot
           sudo wget --progress=dot:mega -O /usr/bin/stacker \
               https://github.com/project-stacker/stacker/releases/download/v1.0.0-rc5/stacker
           sudo chmod 755 /usr/bin/stacker
@@ -29,7 +33,7 @@ jobs:
           stacker --version
 
           sudo wget --progress=dot:mega -O /usr/bin/trust \
-              https://github.com/project-machine/trust/releases/download/v0.0.9/trust-linux-amd64
+              https://github.com/project-machine/mos/releases/download/v0.0.26/trust-linux-amd64
           sudo chmod 755 /usr/bin/trust
           trust keyset add snakeoil
       - name: build golang
diff --git a/layers/mos/stacker.yaml b/layers/mos/stacker.yaml
index 9184bfb..e5edc0d 100644
--- a/layers/mos/stacker.yaml
+++ b/layers/mos/stacker.yaml
@@ -9,7 +9,7 @@ mos-build:
     tag: build-krd
   import:
     - path: ${{MOSCTL_BINARY}}
-      dest: /imports/mosctl/
+      dest: /imports/mosctl/mosctl
     - path: ${{ZOT_BINARY}}
       dest: /imports/zot/
     - zot-config.json
diff --git a/subs.mk b/subs.mk
index b29c574..8096b21 100644
--- a/subs.mk
+++ b/subs.mk
@@ -2,7 +2,7 @@ KEYSET ?= snakeoil
 DOCKER_BASE ?= docker://
 UBUNTU_MIRROR ?= http://archive.ubuntu.com/ubuntu
 KEYSET_D ?= $(HOME)/.local/share/machine/trust/keys/$(KEYSET)
-MOSCTL_BINARY ?= https://github.com/project-machine/mos/releases/download/v0.0.14/mosctl
+MOSCTL_BINARY ?= https://github.com/project-machine/mos/releases/download/v0.0.26/mosctl-linux-amd64
 ZOT_BINARY ?= https://github.com/project-zot/zot/releases/download/v2.0.0-rc5/zot-linux-amd64-minimal
 
 STACKER_SUBS = \