From 96b528877bd8fcf24ec60a9c39554fec9a226758 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:59:48 +0000 Subject: [PATCH] use signed --- .github/workflows/iso.yml | 4 +++- lorax_templates/configure_upgrades.tmpl.in | 2 +- xorriso/gen_input.sh.in | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 3b3295d..76ac434 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -75,12 +75,14 @@ jobs: image_repo=${IMAGE_REPO} \ image_name=${IMAGE_NAME} \ variant=${VARIANT} + mkdir end_iso + mv ${IMAGE_NAME}-${IMAGE_VERSION}.iso end_iso/ - name: Upload ISO as artifact uses: actions/upload-artifact@v4 with: name: ISOs - path: deploy.iso + path: end_iso/*.iso if-no-files-found: error retention-days: 0 compression-level: 0 diff --git a/lorax_templates/configure_upgrades.tmpl.in b/lorax_templates/configure_upgrades.tmpl.in index c3c9371..86226fb 100644 --- a/lorax_templates/configure_upgrades.tmpl.in +++ b/lorax_templates/configure_upgrades.tmpl.in @@ -1,3 +1,3 @@ append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail" -append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin" +append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker://@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin" append usr/share/anaconda/interactive-defaults.ks "%end" \ No newline at end of file diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in index bf06031..9f3962f 100644 --- a/xorriso/gen_input.sh.in +++ b/xorriso/gen_input.sh.in @@ -1,7 +1,7 @@ #!/bin/bash echo "-indev $(pwd)/boot.iso" -echo "-outdev $(pwd)/deploy.iso" +echo "-outdev $(pwd)/@IMAGE_NAME@-@VERSION@.iso" echo "-boot_image any replay" echo "-volid Fedora-S-dvd-x86_64-39" echo "-joliet on"