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

Merge branch 'main' into test_qemu

This commit is contained in:
Jason N 2024-03-04 18:36:00 -05:00 committed by GitHub
commit 5cf11fa046
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -69,10 +69,8 @@ boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
# Step 4: Download container image
container/$(IMAGE_NAME)-$(IMAGE_TAG):
mkdir container || true
podman pull $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
podman save --format oci-dir -o $(_BASE_DIR)/container/$(IMAGE_NAME)-$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
podman rmi $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
mkdir $(_BASE_DIR)/container || true
skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(_BASE_DIR)/container/$(IMAGE_NAME)-$(IMAGE_TAG)
# Step 5: Generate xorriso script
xorriso/%.sh: xorriso/%.sh.in
@ -100,7 +98,7 @@ clean:
rm -f $(_BASE_DIR)/*.log || true
install-deps:
dnf install -y lorax xorriso podman
dnf install -y lorax xorriso skopeo
test-iso:
_TESTS = $(filter-out README.md,$(shell ls tests/iso))