mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 02:47:56 +01:00
fix path
This commit is contained in:
parent
fdb751e6fd
commit
38fb371fa6
2 changed files with 4 additions and 4 deletions
|
|
@ -6,7 +6,7 @@ export ARCH := x86_64
|
|||
export EXTRA_BOOT_PARAMS :=
|
||||
export IMAGE_NAME := base
|
||||
export IMAGE_REPO := quay.io/fedora-ostree-desktops
|
||||
export IMAGE_TAG := $(VERSION)
|
||||
export IMAGE_TAG = $(VERSION)
|
||||
REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))
|
||||
export ROOTFS_SIZE := 4
|
||||
export VARIANT := Server
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ full_list: repo
|
|||
repo: script.sh
|
||||
$(eval IMAGE=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG))
|
||||
$(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)/)
|
||||
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
|
||||
$(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(notdir $(FLATPAK_DIR))" >> $(GITHUB_OUTPUT))
|
||||
$(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 $(FLATPAK_DIR):/flatpak_dir $(IMAGE) /flatpak_dir/script.sh
|
||||
$(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(FLATPAK_DIR)" >> $(GITHUB_OUTPUT))
|
||||
docker rmi $(IMAGE)
|
||||
|
||||
script.sh:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue