1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00

use image_tag

This commit is contained in:
Jason N. 2024-02-26 11:41:36 -05:00
parent 3d8087a0c8
commit 946bc74576
3 changed files with 8 additions and 2 deletions

View file

@ -8,6 +8,7 @@ IMAGE_TAG = $(VERSION)
VARIANT = Server VARIANT = Server
WEB_UI = false WEB_UI = false
REPOS = /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo REPOS = /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo
ADDITIONAL_TEMPLATES = ""
# Generated vars # Generated vars
## Formatting = _UPPERCASE ## Formatting = _UPPERCASE
@ -58,6 +59,7 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
$(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file)) \ $(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file)) \
--add-template $(_BASE_DIR)/lorax_templates/set_installer.tmpl \ --add-template $(_BASE_DIR)/lorax_templates/set_installer.tmpl \
--add-template $(_BASE_DIR)/lorax_templates/configure_upgrades.tmpl \ --add-template $(_BASE_DIR)/lorax_templates/configure_upgrades.tmpl \
$(foreach file,$(ADDITIONAL_TEMPLATES),--add-template $(file)) \
$(_BASE_DIR)/results/ $(_BASE_DIR)/results/
mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/ mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/

View file

@ -33,6 +33,9 @@ inputs:
description: Version of the action container to run description: Version of the action container to run
required: true required: true
default: "latest" default: "latest"
additional_templates:
description: Space delimetered list of additional Lorax templates to include
required: false
runs: runs:
using: composite using: composite
@ -47,4 +50,5 @@ runs:
VARIANT=${{ inputs.variant }} \ VARIANT=${{ inputs.variant }} \
VERSION=${{ inputs.version }} \ VERSION=${{ inputs.version }} \
IMAGE_TAG=${{ inputs.image_tag || inputs.version }} \ IMAGE_TAG=${{ inputs.image_tag || inputs.version }} \
WEB_UI=${{ inputs.web_ui }} WEB_UI=${{ inputs.web_ui }} \
"ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}"

View file

@ -6,7 +6,7 @@ echo "-boot_image any replay"
echo "-joliet on" echo "-joliet on"
echo "-compliance joliet_long_names" echo "-compliance joliet_long_names"
cd container cd container
for file in $(find @IMAGE_NAME@-@VERSION@) for file in $(find @IMAGE_NAME@-@IMAGE_TAG@)
do do
echo "-map $(pwd)/${file} ${file}" echo "-map $(pwd)/${file} ${file}"
echo "-chmod 0444 ${file}" echo "-chmod 0444 ${file}"