Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Web UI #10

Closed
wants to merge 3 commits into from
Closed

Web UI #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5851d3
add tag and web_ui support
JasonN3 Feb 15, 2024
e5d513f
remove rawhide
JasonN3 Feb 15, 2024
1fa05ee
fix var
JasonN3 Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ version = 39
base_dir = $(shell pwd)
image_repo = ghcr.io/ublue-os
image_name = base-main
image_tag = $(version)
variant = Silverblue
web_ui = false

image_repo_escaped = $(subst /,\/,$(image_repo))
image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped))
Expand All @@ -14,6 +16,10 @@ else
lorax_args = --nomacboot
endif

ifeq ($(web_ui),true)
lorax_args += -i anaconda-webui
endif

$(image_name)-$(version).iso: boot.iso container/$(image_name)-$(version) xorriso/input.txt
xorriso -dialog on < $(base_dir)/xorriso/input.txt

Expand All @@ -31,9 +37,9 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.

container/$(image_name)-$(version):
mkdir container
podman pull $(image_repo)/$(image_name):$(version)
podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(version)
podman rmi $(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):$(image_tag)
podman rmi $(image_repo)/$(image_name):$(image_tag)

install-deps:
dnf install -y lorax xorriso podman git rpm-ostree
Expand Down
6 changes: 5 additions & 1 deletion lorax_templates/configure_upgrades.tmpl.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
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 "%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"