From a9f34660a378291de8bb46745b86cea9dc636eab Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <915544+detiber@users.noreply.github.com>
Date: Wed, 18 Dec 2024 08:27:28 -0500
Subject: [PATCH] [chore] minor cleanup

- remove unused variable for iso-builder in Justfile
- fix unused build arg CENTOS_MAJOR_VERSION, replaced with existing build arg MAJOR_VERSION
---
 Containerfile | 2 +-
 Justfile      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index db41e1d..b5d69ad 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-ARG MAJOR_VERSION="${CENTOS_MAJOR_VERSION:-stream10}"
+ARG MAJOR_VERSION="${MAJOR_VERSION:-stream10}"
 
 FROM quay.io/centos-bootc/centos-bootc:$MAJOR_VERSION
 
diff --git a/Justfile b/Justfile
index 3256b09..fa34cf3 100644
--- a/Justfile
+++ b/Justfile
@@ -1,6 +1,5 @@
 repo_organization := "centos-workstation"
 image_name := "main"
-iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.2.3"
 
 [private]
 default:
@@ -77,7 +76,7 @@ build centos_version="stream10" tag="latest":
     fi
 
     BUILD_ARGS=()
-    BUILD_ARGS+=("--build-arg" "CENTOS_MAJOR_VERSION=${centos_version}")
+    BUILD_ARGS+=("--build-arg" "MAJOR_VERSION=${centos_version}")
     # BUILD_ARGS+=("--build-arg" "IMAGE_NAME=${image_name}")
     # BUILD_ARGS+=("--build-arg" "IMAGE_VENDOR={{ repo_organization }}")
     if [[ -z "$(git status -s)" ]]; then
@@ -105,7 +104,9 @@ build-vm image type="qcow2":
 
   if ! sudo podman image exists $TARGET_IMAGE ; then
     echo "Ensuring image is on root storage"
+    COPYTMP=$(mktemp -p "${PWD}" -d -t _build_podman_scp.XXXXXXXXXX)
     sudo podman image scp $USER@localhost::$TARGET_IMAGE root@localhost:: 
+    rm -rf "${COPYTMP}"
   fi
   
   echo "Cleaning up previous build"