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

fix path

Browse source
This commit is contained in:
Jason N. 2024-04-01 15:56:03 -04:00
parent fdb751e6fd
commit 38fb371fa6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.inputs
View file

@ -6,7 +6,7 @@ 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

6
flatpaks/Makefile
View file

@ -5,9 +5,9 @@ full_list: repo
repo: script.sh repo: script.sh
$(eval IMAGE=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)) $(eval IMAGE=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG))
$(eval FLATPAK_DIR=$(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD))) $(eval FLATPAK_DIR=$(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD)))
$(if $(GITHUB_WORKSPACE),cp script.sh $(GITHUB_WORKSPACE)/$(FLATPAK_DIR)/) $(if $(GITHUB_WORKSPACE),cp script.sh $(FLATPAK_DIR)/)
docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume $(_BASE_DIR)/flatpaks:/flatpak_dir $(IMAGE) /flatpak_dir/script.sh docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume $(FLATPAK_DIR):/flatpak_dir $(IMAGE) /flatpak_dir/script.sh
$(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(notdir $(FLATPAK_DIR))" >> $(GITHUB_OUTPUT)) $(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(FLATPAK_DIR)" >> $(GITHUB_OUTPUT))
docker rmi $(IMAGE) docker rmi $(IMAGE)
script.sh: script.sh: