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

what's in results

This commit is contained in:
Jason N. 2024-03-20 13:48:33 -04:00
parent 1bf30ea293
commit b39bc92023
2 changed files with 7 additions and 3 deletions

View file

@ -22,7 +22,6 @@ VOLUME /build-container-installer/repos
VOLUME /cache VOLUME /cache
RUN if [[ "$(grep '^ID=' /etc/os-release)" == 'ID="rhel"' ]]; then dnf install -y coreutils --allowerasing; fi; dnf install -y make && make install-deps RUN if [[ "$(grep '^ID=' /etc/os-release)" == 'ID="rhel"' ]]; then dnf install -y coreutils --allowerasing; fi; dnf install -y make && make install-deps
RUN ln -s /run/secrets/etc-pki-entitlement /etc/pki/entitlement-host && ln -s /run/secrets/rhsm /etc/rhsm-host
ENTRYPOINT ["/bin/bash", "/build-container-installer/entrypoint.sh"] ENTRYPOINT ["/bin/bash", "/build-container-installer/entrypoint.sh"]

View file

@ -167,8 +167,12 @@ repos: $(_REPO_FILES)
repos/%.repo: /etc/yum.repos.d/%.repo repos/%.repo: /etc/yum.repos.d/%.repo
mkdir repos || true mkdir repos || true
cp /etc/yum.repos.d/$*.repo $(_BASE_DIR)/repos/$*.repo cp /etc/yum.repos.d/$*.repo $(_BASE_DIR)/repos/$*.repo
sed -i "s/\$$releasever/${VERSION}/g" $(_BASE_DIR)/repos/$*.repo ifeq ($(_RHEL),true)
sed -i "s/\$$basearch/${ARCH}/g" $(_BASE_DIR)/repos/$*.repo 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 # Step 3: Build boot.iso using Lorax
boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
@ -202,6 +206,7 @@ container/$(IMAGE_NAME)-$(IMAGE_TAG):
# Step 5: Generate xorriso script # Step 5: Generate xorriso script
xorriso/%.sh: xorriso/%.sh.in xorriso/%.sh: xorriso/%.sh.in
find results
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg
$(eval _VARS = IMAGE_NAME IMAGE_TAG ARCH VERSION) $(eval _VARS = IMAGE_NAME IMAGE_TAG ARCH VERSION)