mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 19:07:54 +01:00
use 40 as base image
This commit is contained in:
parent
4710f3002d
commit
d65e6f1d24
3 changed files with 3 additions and 5 deletions
1
.github/workflows/build-and-test.yml
vendored
1
.github/workflows/build-and-test.yml
vendored
|
|
@ -49,6 +49,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
containerfiles: Containerfile
|
containerfiles: Containerfile
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
- name: Push image
|
- name: Push image
|
||||||
uses: redhat-actions/push-to-registry@v2
|
uses: redhat-actions/push-to-registry@v2
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
FROM fedora:39
|
FROM fedora:40
|
||||||
|
|
||||||
ARG VERSION=39
|
ARG VERSION=40
|
||||||
|
|
||||||
ENV ARCH="x86_64"
|
ENV ARCH="x86_64"
|
||||||
ENV IMAGE_NAME="base"
|
ENV IMAGE_NAME="base"
|
||||||
|
|
|
||||||
3
Makefile
3
Makefile
|
|
@ -166,8 +166,6 @@ repos/%.repo: /etc/yum.repos.d/%.repo
|
||||||
boot.iso: $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
|
boot.iso: $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
|
||||||
rm -Rf $(_BASE_DIR)/results || true
|
rm -Rf $(_BASE_DIR)/results || true
|
||||||
mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
|
mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
|
||||||
cp /etc/os-release $(_TEMP_DIR)/os-release || true
|
|
||||||
sed -i 's/PLATFORM_ID=.*/PLATFORM_ID="$(_PLATFORM_ID)"/' /etc/os-release
|
|
||||||
|
|
||||||
# Download the secure boot key
|
# Download the secure boot key
|
||||||
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
|
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
|
||||||
|
|
@ -188,7 +186,6 @@ boot.iso: $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
|
||||||
$(_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 -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true
|
mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true
|
||||||
mv -f $(_TEMP_DIR)/os-release /etc/os-release || 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