mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
default value for image_tag
This commit is contained in:
parent
302b004ed9
commit
a6cb5b7cc8
3 changed files with 5 additions and 5 deletions
2
.github/workflows/iso.yml
vendored
2
.github/workflows/iso.yml
vendored
|
|
@ -37,7 +37,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
arch: ${{ env.ARCH}}
|
arch: ${{ env.ARCH}}
|
||||||
image_name: ${{ env.IMAGE_NAME}}
|
image_name: ${{ env.IMAGE_NAME}}
|
||||||
imagE_repo: ${{ env.IMAGE_REPO}}
|
image_repo: ${{ env.IMAGE_REPO}}
|
||||||
version: ${{ env.VERSION }}
|
version: ${{ env.VERSION }}
|
||||||
variant: ${{ env.VARIANT }}
|
variant: ${{ env.VARIANT }}
|
||||||
|
|
||||||
|
|
|
||||||
4
Makefile
4
Makefile
|
|
@ -34,9 +34,9 @@ build/deploy.iso.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/inp
|
||||||
|
|
||||||
# Step 1: Generate Lorax Templates
|
# Step 1: Generate Lorax Templates
|
||||||
lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
|
lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
|
||||||
sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
|
sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/' $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
|
||||||
|
|
||||||
sed 's/@IMAGE_TAG@/$(IMAGE_TAG)/' $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
|
sed 's/@IMAGE_TAG@/$(IMAGE_TAG)/' $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
|
||||||
mv $(_BASE_DIR)/lorax_templates/$*.tmpl{.tmp,}
|
mv $(_BASE_DIR)/lorax_templates/$*.tmpl{.tmp,}
|
||||||
|
|
||||||
sed 's/@IMAGE_REPO_ESCAPED@/$(_IMAGE_REPO_DOUBLE_ESCAPED)/' $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
|
sed 's/@IMAGE_REPO_ESCAPED@/$(_IMAGE_REPO_DOUBLE_ESCAPED)/' $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ inputs:
|
||||||
required: false
|
required: false
|
||||||
web_ui:
|
web_ui:
|
||||||
description: Enable Anaconda WebUI
|
description: Enable Anaconda WebUI
|
||||||
required: true
|
required: false
|
||||||
default: "false"
|
default: "false"
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
|
|
@ -39,5 +39,5 @@ runs:
|
||||||
- IMAGE_REPO=${{ inputs.image_repo }}
|
- IMAGE_REPO=${{ inputs.image_repo }}
|
||||||
- VARIANT=${{ inputs.variant }}
|
- VARIANT=${{ inputs.variant }}
|
||||||
- VERSION=${{ inputs.version }}
|
- VERSION=${{ inputs.version }}
|
||||||
- IMAGE_TAG=${{ inputs.image_tag }}
|
- IMAGE_TAG=${{ inputs.image_tag || inputs.version }}
|
||||||
- WEB_UI=${{ inputs.web_ui }}
|
- WEB_UI=${{ inputs.web_ui }}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue