mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
set platform_id
This commit is contained in:
parent
d4a65caf44
commit
80a1e2786e
2 changed files with 10 additions and 1 deletions
1
.github/workflows/build-and-test.yml
vendored
1
.github/workflows/build-and-test.yml
vendored
|
|
@ -126,6 +126,7 @@ jobs:
|
||||||
version:
|
version:
|
||||||
- 38
|
- 38
|
||||||
- 39
|
- 39
|
||||||
|
- 40
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repo
|
- name: Checkout repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
|
||||||
10
Makefile
10
Makefile
|
|
@ -137,7 +137,13 @@ repos/%.repo: /etc/yum.repos.d/%.repo
|
||||||
# Step 3: Build boot.iso using Lorax
|
# Step 3: Build boot.iso using Lorax
|
||||||
boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
|
boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
|
||||||
rm -Rf $(_BASE_DIR)/results || true
|
rm -Rf $(_BASE_DIR)/results || true
|
||||||
rm /etc/rpm/macros.image-language-conf || true
|
mv /etc/rpm/macros.image-language-conf /etc/rpm/macros.image-language-conf.orig || true
|
||||||
|
cp /etc/dnf/dnf.conf /etc/dnf/dnf.conf.orig || true
|
||||||
|
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
|
||||||
|
echo "module_platform_id=platform:el${VERSION} >> /etc/dnf/dnf.conf
|
||||||
|
else
|
||||||
|
echo "module_platform_id=platform:f${VERSION} >> /etc/dnf/dnf.conf
|
||||||
|
endif
|
||||||
|
|
||||||
# Download the secure boot key
|
# Download the secure boot key
|
||||||
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
|
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
|
||||||
|
|
@ -155,6 +161,8 @@ boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
|
||||||
$(foreach var,$(_TEMPLATE_VARS),--add-template-var "$(shell echo $(var) | tr '[:upper:]' '[:lower:]')=$($(var))") \
|
$(foreach var,$(_TEMPLATE_VARS),--add-template-var "$(shell echo $(var) | tr '[:upper:]' '[:lower:]')=$($(var))") \
|
||||||
$(_BASE_DIR)/results/
|
$(_BASE_DIR)/results/
|
||||||
mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
|
mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
|
||||||
|
mv /etc/rpm/macros.image-language-conf.orig /etc/rpm/macros.image-language-conf || true
|
||||||
|
mv -f /etc/dnf/dnf.conf.orig /etc/dnf/dnf.conf || true
|
||||||
|
|
||||||
# Step 4: Download container image
|
# Step 4: Download container image
|
||||||
container/$(IMAGE_NAME)-$(IMAGE_TAG):
|
container/$(IMAGE_NAME)-$(IMAGE_TAG):
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue