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

add ubi input

This commit is contained in:
Jason N. 2024-04-10 16:50:57 -04:00
parent d3d40c26eb
commit 1a23a968e4
2 changed files with 10 additions and 6 deletions

View file

@ -121,16 +121,17 @@ jobs:
id: build id: build
with: with:
arch: ${{ needs.load_vars.outputs.ARCH }} arch: ${{ needs.load_vars.outputs.ARCH }}
enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
image_name: ${{ needs.load_vars.outputs.IMAGE_NAME }} image_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}
image_repo: ${{ needs.load_vars.outputs.IMAGE_REPO }} image_repo: ${{ needs.load_vars.outputs.IMAGE_REPO }}
image_tag: ${{ needs.load_vars.outputs.IMAGE_TAG }} image_tag: ${{ needs.load_vars.outputs.IMAGE_TAG }}
version: ${{ matrix.version }}
variant: ${{ needs.load_vars.outputs.VARIANT }}
secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
secrets_dir: ${{ format('{0}/ubi', github.workspace) }}
repos: '/etc/yum.repos.d/redhat.repo' repos: '/etc/yum.repos.d/redhat.repo'
secrets_dir: ${{ format('{0}/ubi', github.workspace) }}
secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
ubi: "true"
variant: ${{ needs.load_vars.outputs.VARIANT }}
version: ${{ matrix.version }}
- name: Upload ISO as artifact - name: Upload ISO as artifact
id: upload id: upload

View file

@ -84,6 +84,9 @@ inputs:
skopeo_cache_key: skopeo_cache_key:
description: Overrides the skopeo cache key description: Overrides the skopeo cache key
required: false required: false
ubi:
description: Use the UBI version of the builder image
required: false
variant: variant:
description: "Source container variant. Available options can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinonite" description: "Source container variant. Available options can be found by running `dnf provides system-release`. Variant will be the third item in the package name. Example: `fedora-release-kinoite-39-34.noarch` will be kinonite"
required: true required: true
@ -203,7 +206,7 @@ runs:
volumes="--volume ${{ inputs.secrets_dir }}:/run/secrets" volumes="--volume ${{ inputs.secrets_dir }}:/run/secrets"
fi fi
# RHEL # RHEL
if [[ ${{ inputs.version }} -lt 30 ]] if [[ "${{ inputs.ubi }}" == "true" ]]
then then
image=${image}-ubi image=${image}-ubi
fi fi