mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
Merge branch 'flatpak' of https://github.com/JasonN3/build-container-installer into flatpak
This commit is contained in:
commit
d8d2c224aa
4 changed files with 9 additions and 10 deletions
1
.github/workflows/build-and-test.yml
vendored
1
.github/workflows/build-and-test.yml
vendored
|
|
@ -90,7 +90,6 @@ jobs:
|
||||||
image_repo: ${{ env.IMAGE_REPO}}
|
image_repo: ${{ env.IMAGE_REPO}}
|
||||||
version: ${{ env.VERSION }}
|
version: ${{ env.VERSION }}
|
||||||
variant: ${{ env.VARIANT }}
|
variant: ${{ env.VARIANT }}
|
||||||
action_version: ${{ steps.meta.outputs.tags || 'latest' }}
|
|
||||||
flatpak_remote_refs: ${{ env.FLATPAK_REFS }}
|
flatpak_remote_refs: ${{ env.FLATPAK_REFS }}
|
||||||
|
|
||||||
- name: Rename ISO
|
- name: Rename ISO
|
||||||
|
|
|
||||||
8
Makefile
8
Makefile
|
|
@ -76,10 +76,8 @@ boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
|
||||||
|
|
||||||
# Step 4: Download container image
|
# Step 4: Download container image
|
||||||
container/$(IMAGE_NAME)-$(IMAGE_TAG):
|
container/$(IMAGE_NAME)-$(IMAGE_TAG):
|
||||||
mkdir container || true
|
mkdir $(_BASE_DIR)/container || true
|
||||||
podman pull $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
|
skopeo copy docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG) oci:$(_BASE_DIR)/container/$(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)
|
|
||||||
|
|
||||||
# Step 5: Generate xorriso script
|
# Step 5: Generate xorriso script
|
||||||
xorriso/%.sh: xorriso/%.sh.in
|
xorriso/%.sh: xorriso/%.sh.in
|
||||||
|
|
@ -107,7 +105,7 @@ clean:
|
||||||
rm -f $(_BASE_DIR)/*.log || true
|
rm -f $(_BASE_DIR)/*.log || true
|
||||||
|
|
||||||
install-deps:
|
install-deps:
|
||||||
dnf install -y lorax xorriso podman
|
dnf install -y lorax xorriso skopeo
|
||||||
|
|
||||||
.PHONY: clean install-deps
|
.PHONY: clean install-deps
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ This action is designed to be called from a GitHub workflow using the following
|
||||||
image_repo: ${{ env.IMAGE_REPO}}
|
image_repo: ${{ env.IMAGE_REPO}}
|
||||||
version: ${{ env.VERSION }}
|
version: ${{ env.VERSION }}
|
||||||
variant: ${{ env.VARIANT }}
|
variant: ${{ env.VARIANT }}
|
||||||
action_version: v1.0.0
|
|
||||||
```
|
```
|
||||||
|
|
||||||
See [Customizing](#customizing) for information about customizing the ISO that gets created using `with`
|
See [Customizing](#customizing) for information about customizing the ISO that gets created using `with`
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ inputs:
|
||||||
default: "false"
|
default: "false"
|
||||||
action_version:
|
action_version:
|
||||||
description: Version of the action container to run
|
description: Version of the action container to run
|
||||||
required: true
|
deprecationMessage: No longer used. github.action_ref replaces the need for this. Will be removed in a future version.
|
||||||
default: "latest"
|
required: false
|
||||||
additional_templates:
|
additional_templates:
|
||||||
description: Space delimited list of additional Lorax templates to include
|
description: Space delimited list of additional Lorax templates to include
|
||||||
required: false
|
required: false
|
||||||
|
|
@ -55,7 +55,10 @@ runs:
|
||||||
- name: Run docker image
|
- name: Run docker image
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
docker run --privileged --volume .:/github/workspace/ ghcr.io/jasonn3/build-container-installer:${{ inputs.action_version }} \
|
# Check if running inside of the action repo
|
||||||
|
if [[ -z "${{ github.action_ref }}" ]]; then if [[ "${{ github.ref_name }}" =~ (.*)/merge ]]; then tag=pr-${BASH_REMATCH[1]}; else tag=${{ github.ref_name }}; fi; fi
|
||||||
|
if [[ -z "${tag}" ]]; then tag=${{ github.action_ref }}; fi
|
||||||
|
docker run --privileged --volume .:/github/workspace/ ghcr.io/jasonn3/build-container-installer:${tag} \
|
||||||
ARCH=${{ inputs.arch }} \
|
ARCH=${{ inputs.arch }} \
|
||||||
IMAGE_NAME=${{ inputs.image_name }} \
|
IMAGE_NAME=${{ inputs.image_name }} \
|
||||||
IMAGE_REPO=${{ inputs.image_repo }} \
|
IMAGE_REPO=${{ inputs.image_repo }} \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue