mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
feat: Allow building from an oci-archive tarball
This commit is contained in:
parent
e0e4de8f9a
commit
d4917f64ea
3 changed files with 12 additions and 2 deletions
8
Makefile
8
Makefile
|
|
@ -86,6 +86,12 @@ _LORAX_TEMPLATES += $(call get_templates,secureboot)
|
|||
_TEMPLATE_VARS += ENROLLMENT_PASSWORD
|
||||
endif
|
||||
|
||||
ifneq ($(IMAGE_TAR),)
|
||||
_IMAGE_TARGET := container/$(IMAGE_NAME)-$(IMAGE_TAG)-tar
|
||||
else
|
||||
_IMAGE_TARGET := container/$(IMAGE_NAME)-$(IMAGE_TAG)
|
||||
endif
|
||||
|
||||
_SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test
|
||||
|
||||
# Create checksum
|
||||
|
|
@ -94,7 +100,7 @@ $(ISO_NAME)-CHECKSUM: $(ISO_NAME)
|
|||
cd $(dir $(ISO_NAME)) && sha256sum $(notdir $(ISO_NAME)) > $(notdir $(ISO_NAME))-CHECKSUM
|
||||
|
||||
# Build end ISO
|
||||
$(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt
|
||||
$(ISO_NAME): results/images/boot.iso $(_IMAGE_TARGET) 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)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ export IMAGE_NAME := base
|
|||
export IMAGE_REPO := quay.io/fedora-ostree-desktops
|
||||
export IMAGE_TAG = $(VERSION)
|
||||
export IMAGE_SIGNED := true
|
||||
export IMAGE_TAR :=
|
||||
REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))
|
||||
export ROOTFS_SIZE := 4
|
||||
export VARIANT := Server
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
$(IMAGE_NAME)-$(IMAGE_TAG):
|
||||
skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(IMAGE_NAME)-$(IMAGE_TAG)
|
||||
|
||||
$(IMAGE_NAME)-$(IMAGE_TAG)-tar:
|
||||
skopeo copy oci-archive:$(IMAGE_TAR) oci:$(IMAGE_NAME):$(IMAGE_TAG)
|
||||
|
||||
install-deps:
|
||||
$(install_pkg) skopeo
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue