From 145893e3271fe9208f0a6f7bb7ccf6b5e3674ae6 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 1 May 2024 10:38:37 -0400
Subject: [PATCH] rename to container

---
 Makefile             | 2 +-
 container/Makefile   | 4 ++--
 xorriso/gen_input.sh | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 38e0bcd..bbfe4e9 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ $(ISO_NAME)-CHECKSUM: $(ISO_NAME)
 	cd $(dir $(ISO_NAME)) && sha256sum $(notdir $(ISO_NAME)) > $(notdir $(ISO_NAME))-CHECKSUM
 
 # Build end ISO
-$(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
+$(ISO_NAME): results/images/boot.iso container/container xorriso/input.txt
 	$(if $(wildcard $(dir $(ISO_NAME))),,mkdir -p $(dir $(ISO_NAME)); chmod ugo=rwX $(dir $(ISO_NAME)))
 	xorriso -dialog on < xorriso/input.txt
 	implantisomd5 $(ISO_NAME)
diff --git a/container/Makefile b/container/Makefile
index 88024a0..53920b0 100644
--- a/container/Makefile
+++ b/container/Makefile
@@ -1,5 +1,5 @@
-$(IMAGE_NAME)-$(IMAGE_TAG):
-	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(IMAGE_NAME)-$(IMAGE_TAG)
+container:
+	skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:container
 
 install-deps:
 	$(install_pkg) skopeo
diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh
index c54eb7a..f75ca04 100644
--- a/xorriso/gen_input.sh
+++ b/xorriso/gen_input.sh
@@ -43,11 +43,11 @@ then
 	echo "-chmod 0444 /sb_pubkey.der"
 fi
 
-pushd "${PWD}/../container/${IMAGE_NAME}-${IMAGE_TAG}" > /dev/null
-for file in $(find)
+pushd "${PWD}/../container" > /dev/null
+for file in $(find container)
 do
-    echo "-map ${PWD}/${file} container/${file}"
-    echo "-chmod 0444 container/${file}"
+    echo "-map ${PWD}/${file} ${file}"
+    echo "-chmod 0444 ${file}"
 done
 popd > /dev/null
 echo "-end"