mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
dynamic repo list
This commit is contained in:
parent
38f41f7acc
commit
a6051d2221
4 changed files with 17 additions and 5 deletions
|
|
@ -19,8 +19,10 @@ COPY /entrypoint.sh /
|
||||||
WORKDIR /build-container-installer
|
WORKDIR /build-container-installer
|
||||||
|
|
||||||
RUN dnf install -y make && make install-deps
|
RUN dnf install -y make && make install-deps
|
||||||
|
RUN ln -s ~/.local/share/containers/cache /cache/skopeo
|
||||||
|
|
||||||
VOLUME /build-container-installer/build
|
VOLUME /build-container-installer/build
|
||||||
|
VOLUME /cache
|
||||||
|
|
||||||
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
|
||||||
|
|
||||||
|
|
|
||||||
17
Makefile
17
Makefile
|
|
@ -7,9 +7,10 @@ IMAGE_NAME = base
|
||||||
IMAGE_TAG = $(VERSION)
|
IMAGE_TAG = $(VERSION)
|
||||||
VARIANT = Server
|
VARIANT = Server
|
||||||
WEB_UI = false
|
WEB_UI = false
|
||||||
REPOS = /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo
|
REPOS = $(subst :,\:,$(shell ls /etc/yum.repos.d/*.repo))
|
||||||
ADDITIONAL_TEMPLATES = ""
|
ADDITIONAL_TEMPLATES = ""
|
||||||
ROOTFS_SIZE = 4
|
ROOTFS_SIZE = 4
|
||||||
|
DNF_CACHE =
|
||||||
|
|
||||||
# Generated vars
|
# Generated vars
|
||||||
## Formatting = _UPPERCASE
|
## Formatting = _UPPERCASE
|
||||||
|
|
@ -20,17 +21,24 @@ _VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG)
|
||||||
_REPO_FILES = $(subst /etc/yum.repos.d,repos,$(REPOS))
|
_REPO_FILES = $(subst /etc/yum.repos.d,repos,$(REPOS))
|
||||||
_LORAX_TEMPLATES = $(subst .in,,$(shell ls lorax_templates/*.tmpl.in)) $(foreach file,$(shell ls lorax_templates/scripts/post),lorax_templates/post_$(file).tmpl)
|
_LORAX_TEMPLATES = $(subst .in,,$(shell ls lorax_templates/*.tmpl.in)) $(foreach file,$(shell ls lorax_templates/scripts/post),lorax_templates/post_$(file).tmpl)
|
||||||
_TEMPLATE_VARS = ARCH VERSION IMAGE_REPO IMAGE_NAME IMAGE_TAG VARIANT WEB_UI REPOS _IMAGE_REPO_ESCAPED _IMAGE_REPO_DOUBLE_ESCAPED
|
_TEMPLATE_VARS = ARCH VERSION IMAGE_REPO IMAGE_NAME IMAGE_TAG VARIANT WEB_UI REPOS _IMAGE_REPO_ESCAPED _IMAGE_REPO_DOUBLE_ESCAPED
|
||||||
|
_LORAX_ARGS =
|
||||||
|
|
||||||
ifeq ($(VARIANT),Server)
|
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
|
||||||
_LORAX_ARGS = --macboot --noupgrade
|
_LORAX_ARGS += --nomacboot --noupgrade
|
||||||
|
else ifeq ($(VARIANT),Server)
|
||||||
|
_LORAX_ARGS += --macboot --noupgrade
|
||||||
else
|
else
|
||||||
_LORAX_ARGS = --nomacboot
|
_LORAX_ARGS += --nomacboot
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WEB_UI),true)
|
ifeq ($(WEB_UI),true)
|
||||||
_LORAX_ARGS += -i anaconda-webui
|
_LORAX_ARGS += -i anaconda-webui
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(DNF_CACHE),)
|
||||||
|
_LORAX_ARGS += --cachedir $(DNF_CACHE)
|
||||||
|
endif
|
||||||
|
|
||||||
# Step 7: Buid end ISO
|
# Step 7: Buid end ISO
|
||||||
## Default action
|
## Default action
|
||||||
build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
|
build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
|
||||||
|
|
@ -85,6 +93,7 @@ lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
|
||||||
$(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED)
|
$(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED)
|
||||||
$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
|
$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
|
||||||
|
|
||||||
|
repos: $(_REPO_FILES)
|
||||||
|
|
||||||
# Step 2: Replace vars in repo files
|
# Step 2: Replace vars in repo files
|
||||||
repos/%.repo: /etc/yum.repos.d/%.repo
|
repos/%.repo: /etc/yum.repos.d/%.repo
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ done
|
||||||
make container/${IMAGE_NAME}-${IMAGE_TAG} $@
|
make container/${IMAGE_NAME}-${IMAGE_TAG} $@
|
||||||
|
|
||||||
# Build base ISO
|
# Build base ISO
|
||||||
make boot.iso $@
|
make boot.iso DNF_CACHE=/cache/dnf $@
|
||||||
|
|
||||||
# Add container to ISO
|
# Add container to ISO
|
||||||
make build/deploy.iso $@
|
make build/deploy.iso $@
|
||||||
|
|
|
||||||
1
external/fedora-lorax-templates
vendored
Submodule
1
external/fedora-lorax-templates
vendored
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit cc1155372046baa58f9d2cc27a9e5473bf05a3fb
|
||||||
Loading…
Add table
Add a link
Reference in a new issue