From 5fbe7e31433c666a236edd9d08b8b0010d6f6faf Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:38:14 +0000 Subject: [PATCH] must be within cwd --- .github/workflows/iso.yml | 3 ++- scripts/gen_xorriso.sh | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 45edb58..c5f7f50 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -98,7 +98,7 @@ jobs: - name: Download container to cache run: | - podman pull dockerregistry:5000/ublue-os/base-main:39 + podman save dockerregistry:5000/ublue-os/base-main:39 > /dev/null - name: Show downloaded files run: | @@ -121,6 +121,7 @@ jobs: - name: Generate xorriso input run: | + ln -s /registry_cache bash scripts/gen_xorriso.sh | tee xorriso.txt - name: Add additional files to ISO diff --git a/scripts/gen_xorriso.sh b/scripts/gen_xorriso.sh index 7a27ad5..c54ca93 100644 --- a/scripts/gen_xorriso.sh +++ b/scripts/gen_xorriso.sh @@ -1,16 +1,15 @@ #!/bin/bash echo "-indev $(pwd)/results/images/boot.iso" -echo "-outdev $(pwd)results/images/deploy.iso" +echo "-outdev $(pwd)/results/images/deploy.iso" echo "-boot_image any replay" echo "-volid Fedora-S-dvd-x86_64-39" echo "-joliet on" echo "-compliance joliet_long_names" -cache_files=$(find /registry_cache) +cache_files=$(find registry_cache) for file in ${cache_files} do - file=$(echo $file | sed 's/^\/registry_cache\/\(.*\)/\1/') - echo "-map $(pwd)/${file} repo_cache/${file}" - echo "-chmod 0444 repo_cache/${file}" + echo "-map $(pwd)/${file} ${file}" + echo "-chmod 0444 ${file}" done echo "-end" \ No newline at end of file