From 70866c9e57104517c888bf0b3c8bcc92f663ea35 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Mon, 26 Feb 2024 10:53:05 -0500
Subject: [PATCH] dynamic repo reference

---
 Makefile      | 7 ++++---
 entrypoint.sh | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bdd4915..6866af2 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ IMAGE_NAME = base
 IMAGE_TAG = $(VERSION)
 VARIANT = Server
 WEB_UI = false
+REPOS = /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo
 
 # Generated vars
 ## Formatting = _UPPERCASE
@@ -14,6 +15,7 @@ _BASE_DIR = $(shell pwd)
 _IMAGE_REPO_ESCAPED = $(subst /,\/,$(IMAGE_REPO))
 _IMAGE_REPO_DOUBLE_ESCAPED = $(subst \,\\\,$(_IMAGE_REPO_ESCAPED))
 _VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG)
+_REPO_FILES = $(notdir $(REPOS))
 
 ifeq ($(VARIANT),'Server')
 _LORAX_ARGS = --macboot --noupgrade
@@ -47,13 +49,12 @@ lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
 	sed -i "s/\$$basearch/${ARCH}/g" $(_BASE_DIR)/$(basename $*).repo
 
 # Step 2: Build boot.iso using Lorax
-boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl fedora.repo fedora-updates.repo
+boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl $(_REPO_FILES)
 	rm -Rf $(_BASE_DIR)/results
 	lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \
           --isfinal --buildarch=$(ARCH) --volid=$(_VOLID) \
           $(_LORAX_ARGS) \
-          --repo $(_BASE_DIR)/fedora.repo \
-          --repo $(_BASE_DIR)/fedora-updates.repo \
+          $(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file);) \
           --add-template $(_BASE_DIR)/lorax_templates/set_installer.tmpl \
 		  --add-template $(_BASE_DIR)/lorax_templates/configure_upgrades.tmpl \
           $(_BASE_DIR)/results/
diff --git a/entrypoint.sh b/entrypoint.sh
index a0e063c..f1423f1 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -13,4 +13,6 @@ make boot.iso $@
 
 make build/deploy.iso $@
 
-mv build /github/workspace/
\ No newline at end of file
+mkdir /github/workspace/build || true
+
+cp /build/*.iso /github/workspace/build
\ No newline at end of file