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

add variant variable

This commit is contained in:
Jason N. 2024-02-14 19:43:11 +00:00
parent 870561781c
commit 9589d82053
2 changed files with 9 additions and 4 deletions

View file

@ -13,6 +13,7 @@ env:
IMAGE_ARCH: x86_64 IMAGE_ARCH: x86_64
IMAGE_NAME: base-main IMAGE_NAME: base-main
IMAGE_REPO: ghcr.io/ublue-os IMAGE_REPO: ghcr.io/ublue-os
VARIANT: Server
jobs: jobs:
@ -54,7 +55,8 @@ jobs:
arch=${IMAGE_ARCH} \ arch=${IMAGE_ARCH} \
version=${IMAGE_VERSION} \ version=${IMAGE_VERSION} \
image_repo=${IMAGE_REPO} \ image_repo=${IMAGE_REPO} \
image_name=${IMAGE_NAME} image_name=${IMAGE_NAME} \
variant=${VARIANT}
- name: Create boot.iso - name: Create boot.iso
run: | run: |
@ -62,7 +64,8 @@ jobs:
arch=${IMAGE_ARCH} \ arch=${IMAGE_ARCH} \
version=${IMAGE_VERSION} \ version=${IMAGE_VERSION} \
image_repo=${IMAGE_REPO} \ image_repo=${IMAGE_REPO} \
image_name=${IMAGE_NAME} image_name=${IMAGE_NAME} \
variant=${VARIANT}
- name: Create deploy.iso - name: Create deploy.iso
run: | run: |
@ -70,7 +73,8 @@ jobs:
arch=${IMAGE_ARCH} \ arch=${IMAGE_ARCH} \
version=${IMAGE_VERSION} \ version=${IMAGE_VERSION} \
image_repo=${IMAGE_REPO} \ image_repo=${IMAGE_REPO} \
image_name=${IMAGE_NAME} image_name=${IMAGE_NAME} \
variant=${VARIANT}
- name: Upload ISO as artifact - name: Upload ISO as artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View file

@ -3,13 +3,14 @@ version = 39
base_dir = $(shell pwd) base_dir = $(shell pwd)
image_repo = ghcr.io/ublue-os image_repo = ghcr.io/ublue-os
image_name = base-main image_name = base-main
variant = Server
deploy.iso: boot.iso xorriso/input.txt $(image_name)-$(version) deploy.iso: boot.iso xorriso/input.txt $(image_name)-$(version)
xorriso -dialog on < xorriso/input.txt xorriso -dialog on < xorriso/input.txt
boot.iso: lorax_templates/set_installer.tmpl boot.iso: lorax_templates/set_installer.tmpl
rm -Rf results rm -Rf results
lorax -p Fedora -v $(version) -r $(version) -t Server \ lorax -p Fedora -v $(version) -r $(version) -t $(variant) \
--isfinal --buildarch=$(arch) --volid=Fedora-S-dvd-$(arch)-$(version) \ --isfinal --buildarch=$(arch) --volid=Fedora-S-dvd-$(arch)-$(version) \
--macboot --noupgrade \ --macboot --noupgrade \
--repo /etc/yum.repos.d/fedora.repo \ --repo /etc/yum.repos.d/fedora.repo \