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

add curl

Browse source
This commit is contained in:
Jason N. 2024-04-02 09:25:00 -04:00
parent e6c67f7303
commit 69619808f6
4 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Makefile.inputs
View file

@ -1,24 +1,24 @@
# Configuration vars # Configuration vars
## Formatting = UPPERCASE ## Formatting = UPPERCASE
# General # General
export ADDITIONAL_TEMPLATES := export ADDITIONAL_TEMPLATES =
export ARCH := x86_64 export ARCH = x86_64
export EXTRA_BOOT_PARAMS := export EXTRA_BOOT_PARAMS =
export IMAGE_NAME := base export IMAGE_NAME = base
export IMAGE_REPO := quay.io/fedora-ostree-desktops export IMAGE_REPO = quay.io/fedora-ostree-desktops
export IMAGE_TAG = $(VERSION) export IMAGE_TAG = $(VERSION)
REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) REPOS = $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))
export ROOTFS_SIZE := 4 export ROOTFS_SIZE = 4
export VARIANT := Server export VARIANT = Server
export VERSION := 39 export VERSION = 39
export WEB_UI := false export WEB_UI = false
# Flatpak # Flatpak
export FLATPAK_REMOTE_NAME := flathub export FLATPAK_REMOTE_NAME = flathub
export FLATPAK_REMOTE_URL := https://flathub.org/repo/flathub.flatpakrepo export FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo
export FLATPAK_REMOTE_REFS := export FLATPAK_REMOTE_REFS =
export FLATPAK_REMOTE_REFS_DIR := export FLATPAK_REMOTE_REFS_DIR =
export FLATPAK_DIR := export FLATPAK_DIR =
# Secure boot # Secure boot
export ENROLLMENT_PASSWORD := export ENROLLMENT_PASSWORD =
export SECURE_BOOT_KEY_URL := export SECURE_BOOT_KEY_URL =
export ISO_NAME := build/deploy.iso export ISO_NAME = build/deploy.iso

2
test/iso/Makefile
View file

@ -20,6 +20,6 @@ clean:
sudo rmdir /mnt/install /mnt/iso sudo rmdir /mnt/install /mnt/iso
install-deps: install-deps:
$(install_pkg) isomd5sum coreutils squashfs-tools $(install_pkg) isomd5sum coreutils squashfs-tools curl
.PHONY: all $(ISO_TESTS) clean .PHONY: all $(ISO_TESTS) clean

2
test/vm/Makefile
View file

@ -48,7 +48,7 @@ ansible_inventory:
.PHONY: $(VM_TESTS) install-deps .PHONY: $(VM_TESTS) install-deps
install-deps: install-deps:
$(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible $(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible curl
files/mnt/iso: files/mnt/iso:
$(if $(wildcard files/mnt),,mkdir files/mnt) $(if $(wildcard files/mnt),,mkdir files/mnt)

22
xorriso/gen_input.sh
View file

@ -6,17 +6,17 @@ echo "-outdev ${ISO_NAME}"
echo "-boot_image any replay" echo "-boot_image any replay"
echo "-joliet on" echo "-joliet on"
echo "-compliance joliet_long_names" echo "-compliance joliet_long_names"
pushd ${_BASE_DIR}/results > /dev/null #pushd ${_BASE_DIR}/results > /dev/null
for file in $(find * -type f) #for file in $(find * -type f)
do #do
if [[ "$file" == "images/boot.iso" ]] # if [[ "$file" == "images/boot.iso" ]]
then # then
continue # continue
fi # fi
echo "-map ${_BASE_DIR}/results/${file} ${file}" # echo "-map ${_BASE_DIR}/results/${file} ${file}"
echo "-chmod 0444 ${file}" # echo "-chmod 0444 ${file}"
done #done
popd > /dev/null #popd > /dev/null
if [[ -n "${FLATPAK_DIR}" ]] if [[ -n "${FLATPAK_DIR}" ]]
then then