mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
Merge branch 'main' into ubi
This commit is contained in:
Jason N.
commit
5422832332
45 changed files with 1021 additions and 541 deletions
294
Makefile
294
Makefile
|
|
@ -1,106 +1,42 @@
|
|||
# Configuration vars
|
||||
## Formatting = UPPERCASE
|
||||
# General
|
||||
ADDITIONAL_TEMPLATES =
|
||||
ARCH = x86_64
|
||||
EXTRA_BOOT_PARAMS =
|
||||
IMAGE_NAME = base
|
||||
IMAGE_REPO = quay.io/fedora-ostree-desktops
|
||||
IMAGE_TAG = $(VERSION)
|
||||
REPOS = $(subst :,\:,$(shell ls /etc/yum.repos.d/*.repo))
|
||||
ROOTFS_SIZE = 4
|
||||
VARIANT = Server
|
||||
VERSION = 39
|
||||
WEB_UI = false
|
||||
# Flatpak
|
||||
FLATPAK_REMOTE_NAME = flathub
|
||||
FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo
|
||||
FLATPAK_REMOTE_REFS =
|
||||
FLATPAK_REMOTE_REFS_DIR =
|
||||
# Secure boot
|
||||
ENROLLMENT_PASSWORD =
|
||||
SECURE_BOOT_KEY_URL =
|
||||
include Makefile.inputs
|
||||
|
||||
###################
|
||||
# Hidden vars
|
||||
|
||||
export SHELL := /bin/sh
|
||||
# Cache
|
||||
DNF_CACHE =
|
||||
PACKAGE_MANAGER = dnf
|
||||
export DNF_CACHE :=
|
||||
export PACKAGE_MANAGER := dnf
|
||||
|
||||
# Functions
|
||||
## Formatting = lowercase
|
||||
# Get a list of templates for the feature
|
||||
# $1 = feature
|
||||
get_templates = $(shell ls lorax_templates/$(1)_*.tmpl) \
|
||||
$(foreach file,$(notdir $(shell ls lorax_templates/scripts/post/$(1)_*)),lorax_templates/post_$(file).tmpl)
|
||||
define get_templates
|
||||
$(wildcard lorax_templates/$(1)_*.tmpl)
|
||||
$(foreach file,$(notdir $(wildcard lorax_templates/scripts/post/$(1)_*)),lorax_templates/post_$(file).tmpl)
|
||||
endef
|
||||
|
||||
# Get a list of tests for the feature
|
||||
# $1 = test type
|
||||
# $2 = feature
|
||||
run_tests = tests="$(shell ls tests/$(1)/$(2)_*)"; \
|
||||
if [ -n "$$tests" ]; \
|
||||
then \
|
||||
chmod +x $$tests; \
|
||||
for test in $$tests; \
|
||||
do \
|
||||
$(foreach var,$(_VARS),$(var)=$($(var))) ./$${test}; \
|
||||
RC=$$?; if [ $$RC != 0 ]; then exit $$RC; fi; \
|
||||
done; \
|
||||
fi
|
||||
|
||||
# Converts a post script to a template
|
||||
# $1 = script to convert
|
||||
# $2 = file on ISO to write
|
||||
# $3 = whether to copy the '<%' lines to the template
|
||||
convert_post_to_tmpl = header=0; \
|
||||
skip=0; \
|
||||
while read -r line; \
|
||||
do \
|
||||
if [[ $$line =~ ^\<\% ]]; \
|
||||
then \
|
||||
if [[ '$(3)' == 'true' ]]; \
|
||||
then \
|
||||
echo $$line >> lorax_templates/post_$(1).tmpl; \
|
||||
fi; \
|
||||
echo >> lorax_templates/post_$(1).tmpl; \
|
||||
else \
|
||||
if [[ $$header == 0 ]]; \
|
||||
then \
|
||||
if [[ $$line =~ ^\#\#\ (.*)$$ ]]; \
|
||||
then \
|
||||
echo "append $(2) \"%post --erroronfail $${BASH_REMATCH[1]}\"" >> lorax_templates/post_$(1).tmpl; \
|
||||
skip=1; \
|
||||
else \
|
||||
echo "append $(2) \"%post --erroronfail\"" >> lorax_templates/post_$(1).tmpl; \
|
||||
fi; \
|
||||
header=1; \
|
||||
fi; \
|
||||
if [[ $$skip == 0 ]]; \
|
||||
then \
|
||||
echo "append $(2) \"$${line//\"/\\\"}\"" >> lorax_templates/post_$(1).tmpl; \
|
||||
fi; \
|
||||
skip=0; \
|
||||
fi; \
|
||||
done < lorax_templates/scripts/post/$(1); \
|
||||
echo "append $(2) \"%end\"" >> lorax_templates/post_$(1).tmpl
|
||||
define install_pkg
|
||||
$(PACKAGE_MANAGER) install -y $(if $(findstring dnf,$(PACKAGE_MANAGER)),--disablerepo='*-testing')
|
||||
endef
|
||||
export install_pkg
|
||||
|
||||
# Generated/internal vars
|
||||
## Formatting = _UPPERCASE
|
||||
_BASE_DIR = $(shell pwd)
|
||||
_IMAGE_REPO_ESCAPED = $(subst /,\/,$(IMAGE_REPO))
|
||||
_IMAGE_REPO_DOUBLE_ESCAPED = $(subst \,\\\,$(_IMAGE_REPO_ESCAPED))
|
||||
_LORAX_ARGS =
|
||||
_LORAX_TEMPLATES = $(call get_templates,install)
|
||||
_REPO_FILES = $(subst /etc/yum.repos.d,repos,$(REPOS))
|
||||
_TEMP_DIR = $(shell mktemp -d)
|
||||
_TEMPLATE_VARS = ARCH _BASE_DIR IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI
|
||||
_VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG)
|
||||
_IMAGE_REPO_ESCAPED := $(subst /,\/,$(IMAGE_REPO))
|
||||
_IMAGE_REPO_DOUBLE_ESCAPED := $(subst \,\\\,$(_IMAGE_REPO_ESCAPED))
|
||||
_LORAX_ARGS :=
|
||||
_LORAX_TEMPLATES := $(call get_templates,install)
|
||||
_REPO_FILES := $(subst /etc/yum.repos.d,repos,$(REPOS))
|
||||
_TEMP_DIR := $(shell mktemp -d)
|
||||
_TEMPLATE_VARS := ARCH IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI
|
||||
_VOLID := $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG)
|
||||
|
||||
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
|
||||
_RHEL = true
|
||||
_RHEL := true
|
||||
else
|
||||
_RHEL = false
|
||||
_RHEL := false
|
||||
endif
|
||||
|
||||
ifeq ($(_RHEL),true)
|
||||
|
|
@ -121,167 +57,91 @@ _LORAX_TEMPLATES += $(call get_templates,cache)
|
|||
_TEMPLATE_VARS += DNF_CACHE
|
||||
endif
|
||||
|
||||
ifneq ($(FLATPAK_DIR),)
|
||||
_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)
|
||||
_LORAX_ARGS += -i flatpak-libs
|
||||
_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
|
||||
else
|
||||
ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
|
||||
COLLECTED_REFS = $(foreach file,$(shell ls $(FLATPAK_REMOTE_REFS_DIR)/*),$(shell cat $(file)))
|
||||
FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
|
||||
COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
|
||||
export FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
|
||||
endif
|
||||
|
||||
ifneq ($(FLATPAK_REMOTE_REFS),)
|
||||
_FLATPAK_REPO_GPG = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
|
||||
_FLATPAK_REPO_URL = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | 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)
|
||||
_LORAX_ARGS += -i flatpak-libs
|
||||
_LORAX_TEMPLATES += $(call get_templates,flatpak) \
|
||||
external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl
|
||||
_TEMPLATE_VARS += 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
|
||||
|
||||
|
||||
ifneq ($(SECURE_BOOT_KEY_URL),)
|
||||
_LORAX_TEMPLATES += $(call get_templates,secureboot)
|
||||
_TEMPLATE_VARS += ENROLLMENT_PASSWORD
|
||||
endif
|
||||
|
||||
# Step 7: Build end ISO
|
||||
_SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test
|
||||
|
||||
# Create checksum
|
||||
## Default action
|
||||
build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
|
||||
mkdir $(_BASE_DIR)/build || true
|
||||
xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
|
||||
implantisomd5 build/deploy.iso
|
||||
$(ISO_NAME)-CHECKSUM: $(ISO_NAME)
|
||||
cd $(dir $(ISO_NAME)) && sha256sum $(notdir $(ISO_NAME)) > $(notdir $(ISO_NAME))-CHECKSUM
|
||||
|
||||
external/lorax/branch-$(VERSION):
|
||||
git config advice.detachedHead false
|
||||
ifeq ($(_RHEL),true)
|
||||
cd external/lorax && git reset --hard HEAD && git checkout origin/rhel$(VERSION)-branch
|
||||
else
|
||||
cd external/lorax && git reset --hard HEAD && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
|
||||
endif
|
||||
touch external/lorax/branch-$(VERSION)
|
||||
# Build end ISO
|
||||
$(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
|
||||
$(if $(wildcard $(dir $(ISO_NAME))),,mkdir -p $(dir $(ISO_NAME)); chmod ugo=rwX $(dir $(ISO_NAME)))
|
||||
xorriso -dialog on < xorriso/input.txt
|
||||
implantisomd5 $(ISO_NAME)
|
||||
chmod ugo=r $(ISO_NAME)
|
||||
$(if $(GITHUB_OUTPUT), echo "iso_name=$(ISO_NAME)" >> $(GITUHB_OUTPUT))
|
||||
|
||||
# Step 1: Generate Lorax Templates
|
||||
lorax_templates/post_%.tmpl: lorax_templates/scripts/post/%
|
||||
$(call convert_post_to_tmpl,$*,usr/share/anaconda/post-scripts/$*.ks,true)
|
||||
# Download the secure boot key
|
||||
sb_pubkey.der:
|
||||
curl --fail -L -o sb_pubkey.der $(SECURE_BOOT_KEY_URL)
|
||||
|
||||
repos: $(_REPO_FILES)
|
||||
|
||||
# Step 2: Replace vars in repo files
|
||||
repos/%.repo: /etc/yum.repos.d/%.repo
|
||||
mkdir repos || true
|
||||
cp /etc/yum.repos.d/$*.repo $(_BASE_DIR)/repos/$*.repo
|
||||
ifeq ($(_RHEL),true)
|
||||
sed -i "s/\/rhel[0-9]+\//\/rhel$(VERSION)\//g" $(_BASE_DIR)/repos/$*.repo
|
||||
else
|
||||
sed -i "s/\$$releasever/$(VERSION)/g" $(_BASE_DIR)/repos/$*.repo
|
||||
sed -i "s/\$$basearch/$(ARCH)/g" $(_BASE_DIR)/repos/$*.repo
|
||||
endif
|
||||
|
||||
# Step 3: Build boot.iso using Lorax
|
||||
boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
|
||||
rm -Rf $(_BASE_DIR)/results || true
|
||||
mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
|
||||
|
||||
# Download the secure boot key
|
||||
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
|
||||
then \
|
||||
curl --fail -L -o $(_BASE_DIR)/sb_pubkey.der $(SECURE_BOOT_KEY_URL); \
|
||||
fi
|
||||
# Build boot.iso using Lorax
|
||||
results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) $(if $(SECURE_BOOT_KEY_URL),sb_pubkey.der)
|
||||
$(if $(wildcard results), rm -Rf results)
|
||||
$(if $(wildcard /etc/rpm/macros.image-language-conf),mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf)
|
||||
|
||||
lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \
|
||||
--isfinal --squashfs-only --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(_BASE_DIR)/external/lorax/share/templates.d/99-generic \
|
||||
--isfinal --squashfs-only --buildarch=$(ARCH) --volid=$(_VOLID) --sharedir $(PWD)/external/lorax/share/templates.d/99-generic \
|
||||
$(_LORAX_ARGS) \
|
||||
$(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file)) \
|
||||
$(foreach file,$(_LORAX_TEMPLATES),--add-template $(_BASE_DIR)/$(file)) \
|
||||
$(foreach file,$(_REPO_FILES),--repo $(PWD)/$(file)) \
|
||||
$(foreach file,$(_LORAX_TEMPLATES),--add-template $(PWD)/$(file)) \
|
||||
$(foreach file,$(ADDITIONAL_TEMPLATES),--add-template $(file)) \
|
||||
$(foreach file,$(_FLATPAK_TEMPLATES),--add-template $(file)) \
|
||||
$(foreach file,$(_EXTERNAL_TEMPLATES),--add-template $(_BASE_DIR)/external/$(file)) \
|
||||
$(foreach file,$(_EXTERNAL_TEMPLATES),--add-template $(PWD)/external/$(file)) \
|
||||
--rootfs-size $(ROOTFS_SIZE) \
|
||||
$(foreach var,$(_TEMPLATE_VARS),--add-template-var "$(shell echo $(var) | tr '[:upper:]' '[:lower:]')=$($(var))") \
|
||||
$(_BASE_DIR)/results/
|
||||
mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
|
||||
mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true
|
||||
|
||||
# Step 4: Download container image
|
||||
container/$(IMAGE_NAME)-$(IMAGE_TAG):
|
||||
mkdir $(_BASE_DIR)/container || true
|
||||
skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(_BASE_DIR)/container/$(IMAGE_NAME)-$(IMAGE_TAG)
|
||||
|
||||
# Step 5: Generate xorriso script
|
||||
xorriso/%.sh: xorriso/%.sh.in
|
||||
find $(_BASE_DIR)/results
|
||||
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg || true
|
||||
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg
|
||||
$(eval _VARS = IMAGE_NAME IMAGE_TAG ARCH VERSION)
|
||||
$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/xorriso/$*.sh.in > $(_BASE_DIR)/xorriso/$*.sh
|
||||
|
||||
# Step 6: Generate xorriso input
|
||||
xorriso/input.txt: xorriso/gen_input.sh
|
||||
bash $(_BASE_DIR)/xorriso/gen_input.sh | tee $(_BASE_DIR)/xorriso/input.txt
|
||||
results/
|
||||
$(if $(wildcard $(_TEMP_DIR)/macros.image-language-conf),mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf)
|
||||
|
||||
|
||||
FILES_TO_CLEAN := $(wildcard build debugdata pkglists results original-pkgsizes.txt final-pkgsizes.txt lorax.conf *.iso *log)
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -Rf $(_BASE_DIR)/build || true
|
||||
rm -Rf $(_BASE_DIR)/container || true
|
||||
rm -Rf $(_BASE_DIR)/debugdata || true
|
||||
rm -Rf $(_BASE_DIR)/pkglists || true
|
||||
rm -Rf $(_BASE_DIR)/repos || true
|
||||
rm -Rf $(_BASE_DIR)/results || true
|
||||
rm -f $(_BASE_DIR)/lorax_templates/*.tmpl || true
|
||||
rm -f $(_BASE_DIR)/xorriso/input.txt || true
|
||||
rm -f $(_BASE_DIR)/xorriso/*.sh || true
|
||||
rm -f $(_BASE_DIR)/{original,final}-pkgsizes.txt || true
|
||||
rm -f $(_BASE_DIR)/lorax.conf || true
|
||||
rm -f $(_BASE_DIR)/*.iso || true
|
||||
rm -f $(_BASE_DIR)/*.log || true
|
||||
rm -Rf $(FILES_TO_CLEAN)
|
||||
$(foreach DIR,$(_SUBDIRS),$(MAKE) -w -C $(DIR) clean;)
|
||||
|
||||
.PHONY: install-deps
|
||||
install-deps:
|
||||
$(PACKAGE_MANAGER) install -y ${disable} lorax xorriso skopeo flatpak dbus-daemon ostree coreutils gettext git subscription-manager
|
||||
|
||||
install-test-deps:
|
||||
$(PACKAGE_MANAGER) install -y qemu qemu-utils xorriso unzip qemu-system-x86 netcat socat jq isomd5sum ansible make coreutils squashfs-tools
|
||||
$(install_pkg) lorax xorriso coreutils gettext
|
||||
$(foreach DIR,$(filter-out test,$(_SUBDIRS)),$(MAKE) -w -C $(DIR) install-deps;)
|
||||
|
||||
|
||||
test: test-iso test-vm
|
||||
.PHONY: $(_SUBDIRS) $(wildcard test/*) $(wildcard test/*/*)
|
||||
test $(addsuffix /*,$(_SUBDIRS)):
|
||||
$(eval DIR=$(firstword $(subst /, ,$@)))
|
||||
$(if $(filter-out $(DIR),$@), $(eval TARGET=$(subst $(DIR)/,,$@)),$(eval TARGET=))
|
||||
$(MAKE) -w -C $(DIR) $(TARGET)
|
||||
|
||||
test-repo:
|
||||
bash tests/repo/vars.sh
|
||||
|
||||
test-iso:
|
||||
$(eval _VARS = VERSION FLATPAK_REMOTE_NAME _FLATPAK_REPO_URL)
|
||||
|
||||
sudo modprobe loop
|
||||
sudo mkdir /mnt/iso /mnt/install
|
||||
sudo mount -o loop deploy.iso /mnt/iso
|
||||
sudo mount -t squashfs -o loop /mnt/iso/images/install.img /mnt/install
|
||||
|
||||
# install tests
|
||||
$(call run_tests,iso,install)
|
||||
|
||||
# flapak tests
|
||||
if [ -n "$(FLATPAK_REMOTE_REFS)" ]; then $(call run_tests,iso,flatpak); fi
|
||||
|
||||
# Cleanup
|
||||
sudo umount /mnt/install
|
||||
sudo umount /mnt/iso
|
||||
|
||||
ansible_inventory:
|
||||
echo "ungrouped:" > ansible_inventory
|
||||
echo " hosts:" >> ansible_inventory
|
||||
echo " vm:" >> ansible_inventory
|
||||
echo " ansible_host: ${VM_IP}" >> ansible_inventory
|
||||
echo " ansible_port: ${VM_PORT}" >> ansible_inventory
|
||||
echo " ansible_user: ${VM_USER}" >> ansible_inventory
|
||||
echo " ansible_password: ${VM_PASS}" >> ansible_inventory
|
||||
echo " ansible_become_pass: ${VM_PASS}" >> ansible_inventory
|
||||
echo " ansible_ssh_common_args: '-o StrictHostKeyChecking=no'" >> ansible_inventory
|
||||
|
||||
test-vm: ansible_inventory
|
||||
$(eval _VARS = IMAGE_REPO IMAGE_NAME IMAGE_TAG)
|
||||
|
||||
ansible -i ansible_inventory -m ansible.builtin.wait_for_connection vm
|
||||
|
||||
# install tests
|
||||
$(call run_tests,vm,install)
|
||||
|
||||
# flapak tests
|
||||
if [ -n "$(FLATPAK_REMOTE_REFS)" ]; then $(call run_tests,vm,flatpak); fi
|
||||
|
||||
.PHONY: clean install-deps install-test-deps test test-iso test-vm
|
||||
.DEFAULT:
|
||||
$(eval DIR=$(firstword $(subst /, ,$@)))
|
||||
$(if $(filter-out $(DIR),$@), $(eval TARGET=$(subst $(DIR)/,,$@)),$(eval TARGET=))
|
||||
$(MAKE) -w -C $(DIR) $(TARGET)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue