From fcd2f92f3056c698b5f14f0df14ddd41eb2ba94d Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Mon, 1 Apr 2024 09:56:29 -0400 Subject: [PATCH] set container to 39 --- Containerfile | 4 ++-- Makefile | 1 + test/iso/install_hash.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index fc097e5..f0b2174 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM fedora:40 +FROM fedora:39 -ARG VERSION=40 +ARG VERSION=39 ENV ARCH="x86_64" ENV IMAGE_NAME="base" diff --git a/Makefile b/Makefile index a1dd261..165eec5 100644 --- a/Makefile +++ b/Makefile @@ -79,6 +79,7 @@ $(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorris xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt implantisomd5 $(ISO_NAME) chmod ugo=r $(ISO_NAME) + $(if $(GITHUB_OUTPUT), echo "iso_name=$(ISO_NAME)" >> $(GITUHB_OUTPUT)) # Build boot.iso using Lorax results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) diff --git a/test/iso/install_hash.sh b/test/iso/install_hash.sh index ad04549..de6fcc6 100644 --- a/test/iso/install_hash.sh +++ b/test/iso/install_hash.sh @@ -8,7 +8,7 @@ then echo "Found:" checkisomd5 --md5sumonly ../../${ISO_NAME} echo "Expected:" - implantisomd5 --force base-39.iso + implantisomd5 --force ../../${ISO_NAME} fi cd $(dirname ../../${ISO_NAME}) && sha256sum -c $(basename ${ISO_NAME})-CHECKSUM \ No newline at end of file