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

fix: changes requested

This commit is contained in:
Noel Miller 2024-03-07 11:50:21 -06:00
parent e3f6371041
commit 72721268f4
2 changed files with 7 additions and 5 deletions

View file

@ -13,7 +13,6 @@ SECURE_BOOT_KEY_URL =
ADDITIONAL_TEMPLATES = ADDITIONAL_TEMPLATES =
EXTRA_BOOT_PARAMS = EXTRA_BOOT_PARAMS =
ROOTFS_SIZE = 4 ROOTFS_SIZE = 4
ISO_NAME = $(IMAGE_NAME)-$(IMAGE_TAG)
# Generated vars # Generated vars
## Formatting = _UPPERCASE ## Formatting = _UPPERCASE
@ -41,8 +40,6 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.t
mkdir $(_BASE_DIR)/build || true mkdir $(_BASE_DIR)/build || true
xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
implantisomd5 build/deploy.iso implantisomd5 build/deploy.iso
mv build/deploy.iso build/$(ISO_NAME).iso
cd build && sha256sum $(ISO_NAME).iso > $(ISO_NAME)-CHECKSUM
# Step 1: Generate Lorax Templates # Step 1: Generate Lorax Templates
lorax_templates/post_%.tmpl: lorax_templates/scripts/post/% lorax_templates/post_%.tmpl: lorax_templates/scripts/post/%

View file

@ -65,7 +65,7 @@ runs:
# Check if running inside of the action repo # Check if running inside of the action repo
if [[ -z "${{ github.action_ref }}" ]]; then if [[ "${{ github.ref_name }}" =~ (.*)/merge ]]; then tag=pr-${BASH_REMATCH[1]}; else tag=${{ github.ref_name }}; fi; fi if [[ -z "${{ github.action_ref }}" ]]; then if [[ "${{ github.ref_name }}" =~ (.*)/merge ]]; then tag=pr-${BASH_REMATCH[1]}; else tag=${{ github.ref_name }}; fi; fi
if [[ -z "${tag}" ]]; then tag=${{ github.action_ref }}; fi if [[ -z "${tag}" ]]; then tag=${{ github.action_ref }}; fi
docker run --privileged --volume ${{ github.workspace }}:/build-container-installer/build ghcr.io/jasonn3/build-container-installer:${tag} \ docker run --privileged --volume /github/workspace:/build-container-installer/build ghcr.io/jasonn3/build-container-installer:${tag} \
ARCH=${{ inputs.arch }} \ ARCH=${{ inputs.arch }} \
IMAGE_NAME=${{ inputs.image_name }} \ IMAGE_NAME=${{ inputs.image_name }} \
IMAGE_REPO=${{ inputs.image_repo }} \ IMAGE_REPO=${{ inputs.image_repo }} \
@ -77,6 +77,11 @@ runs:
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 }}"
- name: Rename ISO file
shell: bash
run: |
mv /github/workspace/deploy.iso /github/workspace/${{ inputs.iso_name }}.iso
cd /github/workspace
sha256sum ${{ inputs.iso_name }}.iso > ${{ inputs.iso_name }}-CHECKSUM
echo "ISO_PATH=$(realpath ${{ github.workspace }}/${{ inputs.iso_name }}.iso)" >> $GITHUB_OUTPUT echo "ISO_PATH=$(realpath ${{ github.workspace }}/${{ inputs.iso_name }}.iso)" >> $GITHUB_OUTPUT
echo "CHECKSUM_PATH=$(realpath ${{ github.workspace }}/${{ inputs.iso_name }}-CHECKSUM)" >> $GITHUB_OUTPUT echo "CHECKSUM_PATH=$(realpath ${{ github.workspace }}/${{ inputs.iso_name }}-CHECKSUM)" >> $GITHUB_OUTPUT