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

feat: added ISO_NAME as param

This commit is contained in:
Noel Miller 2024-03-06 00:37:28 -06:00
parent 7a639d6445
commit f06a0ad6f4
4 changed files with 11 additions and 3 deletions

View file

@ -17,6 +17,7 @@ env:
VARIANT: 'Server' VARIANT: 'Server'
SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
ENROLLMENT_PASSWORD: 'container-installer' ENROLLMENT_PASSWORD: 'container-installer'
ISO_NAME: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}
jobs: jobs:
@ -92,13 +93,14 @@ jobs:
variant: ${{ env.VARIANT }} variant: ${{ env.VARIANT }}
secure_boot_key_url: ${{ env.SECURE_BOOT_KEY_URL }} secure_boot_key_url: ${{ env.SECURE_BOOT_KEY_URL }}
enrollment_password: ${{ env.ENROLLMENT_PASSWORD }} enrollment_password: ${{ env.ENROLLMENT_PASSWORD }}
iso_name: ${{ env.ISO_NAME }}
- name: Upload ISO as artifact - name: Upload ISO as artifact
id: upload id: upload
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso name: ${{ env.ISO_NAME }}.iso
path: ${{ github.workspace}}/${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso path: ${{ github.workspace}}/${{ env.ISO_NAME }}.iso
if-no-files-found: error if-no-files-found: error
retention-days: 0 retention-days: 0
compression-level: 0 compression-level: 0

View file

@ -9,6 +9,7 @@ ENV IMAGE_TAG="${VERSION}"
ENV VARIANT="Server" ENV VARIANT="Server"
ENV VERSION="${VERSION}" ENV VERSION="${VERSION}"
ENV WEB_UI="false" ENV WEB_UI="false"
ENV ISO_NAME="${IMAGE_NAME}-${IMAGE_TAG}"
RUN mkdir /build-container-installer RUN mkdir /build-container-installer

View file

@ -29,6 +29,10 @@ inputs:
description: Enable Anaconda WebUI description: Enable Anaconda WebUI
required: false required: false
default: "false" default: "false"
iso_name:
description: Used for specifying the name of the output iso
required: false
default: "${{ inputs.image_name }}-${{ inputs.image_tag || inputs.version }}"
enrollment_password: enrollment_password:
description: Used for supporting secure boot (requires SECURE_BOOT_KEY_URL to be defined) description: Used for supporting secure boot (requires SECURE_BOOT_KEY_URL to be defined)
required: false required: false
@ -61,6 +65,7 @@ runs:
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 }} \
ISO_NAME=${{ inputs.iso_name }} \
ENROLLMENT_PASSWORD=${{ inputs.enrollment_password }} \ ENROLLMENT_PASSWORD=${{ inputs.enrollment_password }} \
SECURE_BOOT_KEY_URL=${{ inputs.secure_boot_key_url }} \ SECURE_BOOT_KEY_URL=${{ inputs.secure_boot_key_url }} \
"ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}" "ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}"

View file

@ -15,4 +15,4 @@ make boot.iso $@
# Add container to ISO # Add container to ISO
make build/deploy.iso $@ make build/deploy.iso $@
mv build/deploy.iso build/${IMAGE_NAME}-${VERSION}.iso mv build/deploy.iso build/${ISO_NAME}.iso