feat: variable image name

Author: simonwalz

image-factory/create_image.sh

@@ -56,16 +56,22 @@ image_version() {
 }
 
 export DOCKER_CONTEXT=default
+OUTPUT_DIR="/output"
 
-IMAGE="/output/image.img"
-#IMAGE_QCOW="/output/image.qcow2"
+if [[ ! -d "${OUTPUT_DIR}" ]]; then
+  echo "Build dir does not exist."
+  exit 1
+fi
+
+IMAGE_NAME="${IMAGE_NAME:-"image"}"
+IMAGE="${OUTPUT_DIR}/${IMAGE_NAME}.img"
 
-if [[ ! -d "/output" ]]; then
+if [[ ! -d "${OUTPUT_DIR}" ]]; then
 	echo "Output dir not mounted"
 	exit 1
 fi
 
-export CONFIG_PATH="/output/system.json"
+export CONFIG_PATH="${OUTPUT_DIR}/${IMAGE_NAME}.json"
 if [[ ! -f "${CONFIG_PATH}" ]]; then
 	echo "Config file not found: ${CONFIG_PATH}"
 	exit 1

installer-factory/create_iso.sh

@@ -11,34 +11,40 @@ if [[ ! -d "${OUTPUT_DIR}" ]]; then
   echo "Build dir does not exist."
   exit 1
 fi
-if [[ ! -f "${OUTPUT_DIR}/image.img" ]]; then
+
+export DOCKER_CONTEXT=default
+IMAGE_NAME="${IMAGE_NAME:-"installer"}"
+INSTALLER="${OUTPUT_DIR}/${IMAGE_NAME}.iso"
+IMAGE="${OUTPUT_DIR}/${IMAGE_NAME}.img"
+
+if [[ ! -f "${IMAGE}" ]]; then
   echo "Image file does not exist."
   exit 1
 fi
 
-export DOCKER_CONTEXT=default
+rm -f "${INSTALLER}"
 
-rm -f "${OUTPUT_DIR}/installer.iso"
+export CONFIG_PATH="${OUTPUT_DIR}/${IMAGE_NAME}.json"
 
 # compress image using zstd (multi-threaded, level 9) and copy to the ISO dir
 # choose level 9 as a balance between compression ratio and build time; adjust as desired
-zstd -T0 -9 -c "${OUTPUT_DIR}/image.img" > "${ISO_DIR}/image.img.zst"
+zstd -T0 -9 -c "${IMAGE}" > "${ISO_DIR}/image.img.zst"
 
-if [[ -f "${OUTPUT_DIR}/system.json" ]]; then
-  cp "${OUTPUT_DIR}/system.json" "${ISO_DIR}"
+if [[ -f "${CONFIG_PATH}" ]]; then
+  cp "${CONFIG_PATH}" "${ISO_DIR}/system.json"
 
-  if jq -e '.installer_auto_overwrite_disk == true' "${OUTPUT_DIR}/system.json" > /dev/null; then
+  if jq -e '.installer_auto_overwrite_disk == true' "${CONFIG_PATH}" > /dev/null; then
     touch "${ISO_DIR}/installer_auto_overwrite_disk.txt"
   fi
 
 fi
 
 grub-mkrescue \
-  -o "${OUTPUT_DIR}/installer.iso" \
+  -o "${INSTALLER}" \
   -V "${VOLID}" \
   -iso-level 3 \
   -full-iso9660-filenames \
   "${ISO_DIR}" || exit 1
 
 echo "ISO creation complete."
-echo "Installer written to ${OUTPUT_DIR/\//}/installer.iso"
+echo "Installer written to ${INSTALLER/\//}"