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

add tag and web_ui support

Browse source
This commit is contained in:
Jason N. 2024-02-15 18:26:12 +00:00
parent feec50596a
commit d5851d33b1
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -3,7 +3,9 @@ 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
image_tag = $(version)
variant = Silverblue variant = Silverblue
web_ui = false
image_repo_escaped = $(subst /,\/,$(image_repo)) image_repo_escaped = $(subst /,\/,$(image_repo))
image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped)) image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped))
@ -14,6 +16,10 @@ else
lorax_args = --nomacboot lorax_args = --nomacboot
endif endif
ifeq ($(webui),'true')
lorax_args += -i anaconda-webui
endif
$(image_name)-$(version).iso: boot.iso container/$(image_name)-$(version) xorriso/input.txt $(image_name)-$(version).iso: boot.iso container/$(image_name)-$(version) xorriso/input.txt
xorriso -dialog on < $(base_dir)/xorriso/input.txt xorriso -dialog on < $(base_dir)/xorriso/input.txt
@ -24,6 +30,7 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
$(lorax_args) \ $(lorax_args) \
--repo /etc/yum.repos.d/fedora.repo \ --repo /etc/yum.repos.d/fedora.repo \
--repo /etc/yum.repos.d/fedora-updates.repo \ --repo /etc/yum.repos.d/fedora-updates.repo \
--repo /etc/yum.repos.d/fedora-rawhide.repo \
--add-template $(base_dir)/lorax_templates/set_installer.tmpl \ --add-template $(base_dir)/lorax_templates/set_installer.tmpl \
--add-template $(base_dir)/lorax_templates/configure_upgrades.tmpl \ --add-template $(base_dir)/lorax_templates/configure_upgrades.tmpl \
$(base_dir)/results/ $(base_dir)/results/
@ -31,9 +38,9 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
container/$(image_name)-$(version): container/$(image_name)-$(version):
mkdir container mkdir container
podman pull $(image_repo)/$(image_name):$(version) podman pull $(image_repo)/$(image_name):$(image_tag)
podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(version) podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(image_tag)
podman rmi $(image_repo)/$(image_name):$(version) podman rmi $(image_repo)/$(image_name):$(image_tag)
install-deps: install-deps:
dnf install -y lorax xorriso podman git rpm-ostree dnf install -y lorax xorriso podman git rpm-ostree

4
lorax_templates/configure_upgrades.tmpl.in
View file

@ -1,3 +1,7 @@
append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail" append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin" append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin"
append usr/share/anaconda/interactive-defaults.ks "%end" append usr/share/anaconda/interactive-defaults.ks "%end"
append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail"
append usr/share/anaconda/post-scripts/configure_upgrades.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin"
append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end"