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

Merge branch 'main' into dependabot/github_actions/docker/login-action-3.4.0

Browse source
This commit is contained in:
Jason Nagin 2025-05-05 18:43:23 -04:00 • committed by GitHub
commit 1cdb45e0e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.github/workflows/build_vars.yml vendored
View file

@ -9,9 +9,9 @@ on:
value: ' value: '
{ {
"version": [ "version": [
"39",
"40", "40",
"41" "41",
"42"
], ],
"flatpaks": [ "flatpaks": [
"false", "false",
@ -20,6 +20,7 @@ on:
], ],
"image_repo": [ "image_repo": [
"ghcr.io/ublue-os", "ghcr.io/ublue-os",
"quay.io/fedora",
"quay.io/fedora-ostree-desktops" "quay.io/fedora-ostree-desktops"
], ],
"include": [ "include": [
@ -28,20 +29,22 @@ on:
"image_name": "base-main", "image_name": "base-main",
}, },
{ {
"image_repo": "quay.io/fedora-ostree-desktops", "image_repo": "quay.io/fedora",
"version": "40", "image_name": "fedora-bootc"
"image_name": "base"
}, },
{ {
"image_repo": "quay.io/fedora-ostree-desktops", "image_repo": "quay.io/fedora-ostree-desktops",
"version": "41",
"image_name": "base-atomic" "image_name": "base-atomic"
} }
], ],
"exclude": [ "exclude": [
{ {
"image_repo": "quay.io/fedora-ostree-desktops", "image_repo": "quay.io/fedora",
"version": "39" "flatpaks": "flatpak_refs_dir"
},
{
"image_repo": "quay.io/fedora",
"flatpaks": "flatpak_refs"
}, },
{ {
"image_repo": "quay.io/fedora-ostree-desktops", "image_repo": "quay.io/fedora-ostree-desktops",
@ -50,6 +53,10 @@ on:
{ {
"image_repo": "quay.io/fedora-ostree-desktops", "image_repo": "quay.io/fedora-ostree-desktops",
"flatpaks": "flatpak_refs" "flatpaks": "flatpak_refs"
},
{
"image_repo": "quay.io/fedora-ostree-desktops",
"version": "40"
} }
] ]
}' }'

30
Makefile
View file

@ -27,7 +27,7 @@ export install_pkg
_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))
_LORAX_ARGS := _LORAX_ARGS :=
_LORAX_TEMPLATES := $(call get_templates,install) export _LORAX_TEMPLATES := $(call get_templates,install) lorax_templates/install_include_post.tmpl
_REPO_FILES := $(subst /etc/yum.repos.d,repos,$(REPOS)) _REPO_FILES := $(subst /etc/yum.repos.d,repos,$(REPOS))
_TEMP_DIR := $(shell mktemp -d) _TEMP_DIR := $(shell mktemp -d)
_TEMPLATE_VARS := ARCH IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_SIGNED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI _TEMPLATE_VARS := ARCH IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_SIGNED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI
@ -35,7 +35,7 @@ _VOLID := $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo) ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
export _RHEL := true export _RHEL := true
_LORAX_TEMPLATES += $(call get_templates,rhel) export _LORAX_TEMPLATES += $(call get_templates,rhel)
else else
undefine _RHEL undefine _RHEL
endif endif
@ -53,17 +53,17 @@ _LORAX_ARGS += -i anaconda-webui
endif endif
ifneq ($(DNF_CACHE),) ifneq ($(DNF_CACHE),)
_LORAX_ARGS += --cachedir $(DNF_CACHE) _LORAX_ARGS += --cachedir $(DNF_CACHE)
_LORAX_TEMPLATES += $(call get_templates,cache) export _LORAX_TEMPLATES += $(call get_templates,cache)
_TEMPLATE_VARS += DNF_CACHE _TEMPLATE_VARS += DNF_CACHE
endif endif
ifneq ($(FLATPAK_DIR),) ifneq ($(FLATPAK_DIR),)
_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2) _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2) export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
_LORAX_ARGS += -i flatpak-libs _LORAX_ARGS += -i flatpak-libs
_LORAX_TEMPLATES += $(call get_templates,flatpak) export _LORAX_TEMPLATES += $(call get_templates,flatpak)
_TEMPLATE_VARS += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL _TEMPLATE_VARS += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
else else
ifneq ($(FLATPAK_REMOTE_REFS_DIR),) ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file))) COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
@ -71,19 +71,19 @@ export FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
endif endif
ifneq ($(FLATPAK_REMOTE_REFS),) ifneq ($(FLATPAK_REMOTE_REFS),)
_FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2) _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2) export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
_LORAX_ARGS += -i flatpak-libs _LORAX_ARGS += -i flatpak-libs
_LORAX_TEMPLATES += $(call get_templates,flatpak) \ export _LORAX_TEMPLATES += $(call get_templates,flatpak) \
external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
_TEMPLATE_VARS += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL _TEMPLATE_VARS += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
endif endif
endif endif
ifneq ($(SECURE_BOOT_KEY_URL),) ifneq ($(SECURE_BOOT_KEY_URL),)
_LORAX_TEMPLATES += $(call get_templates,secureboot) export _LORAX_TEMPLATES += $(call get_templates,secureboot)
_TEMPLATE_VARS += ENROLLMENT_PASSWORD _TEMPLATE_VARS += ENROLLMENT_PASSWORD
endif endif
_SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test _SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test

6
lorax_templates/Makefile
View file

@ -39,9 +39,13 @@ endef
post_%.tmpl: scripts/post/% post_%.tmpl: scripts/post/%
$(call convert_post_to_tmpl,$*,usr/share/anaconda/post-scripts/$*.ks,true) $(call convert_post_to_tmpl,$*,usr/share/anaconda/post-scripts/$*.ks,true)
install_include_post.tmpl:
echo '<%page />' > install_include_post.tmpl
for file in $(patsubst post_%.tmpl, %, $(filter post_%, $(notdir $(_LORAX_TEMPLATES)))); do echo "append usr/share/anaconda/interactive-defaults.ks \"%include /usr/share/anaconda/post-scripts/$${file}.ks\"" >> install_include_post.tmpl; done
install-deps: install-deps:
FILES=$(wildcard post_*) FILES=$(wildcard post_*) install_include_post.tmpl
clean: clean:
ifneq ($(FILES),) ifneq ($(FILES),)
rm -Rf $(FILES) rm -Rf $(FILES)

2
test/vm/Makefile
View file

@ -24,7 +24,7 @@ ansible_inventory:
.PHONY: $(VM_TESTS) install-deps .PHONY: $(VM_TESTS) install-deps
install-deps: install-deps:
$(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible curl $(install_pkg) qemu-system qemu-utils xorriso qemu-system-x86 ncat socat jq ansible curl
files/mnt/iso: files/mnt/iso:
$(if $(wildcard files/mnt),,mkdir files/mnt) $(if $(wildcard files/mnt),,mkdir files/mnt)