Merge branch 'flatpak' of https://github.com/JasonN3/build-container-installer into flatpak

.github/workflows/build-and-test.yml

@@ -90,7 +90,6 @@ jobs:
           image_repo: ${{ env.IMAGE_REPO}}
           version: ${{ env.VERSION }}
           variant: ${{ env.VARIANT }}
-          action_version: ${{ steps.meta.outputs.tags || 'latest' }}
           flatpak_remote_refs: ${{ env.FLATPAK_REFS }}
 
       - name: Rename ISO

Makefile

@@ -76,10 +76,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
@@ -107,7 +105,7 @@ clean:
 	rm -f $(_BASE_DIR)/*.log || true
 
 install-deps:
-	dnf install -y lorax xorriso podman
+	dnf install -y lorax xorriso skopeo
 	
 .PHONY: clean install-deps
 

README.md

@@ -14,7 +14,6 @@ This action is designed to be called from a GitHub workflow using the following
     image_repo: ${{ env.IMAGE_REPO}}
     version: ${{ env.VERSION }}
     variant: ${{ env.VARIANT }}
-    action_version: v1.0.0
 ```
 
 See [Customizing](#customizing) for information about customizing the ISO that gets created using `with`

action.yml

@@ -31,8 +31,8 @@ inputs:
     default: "false"
   action_version:
     description: Version of the action container to run
-    required: true
-    default: "latest"
+    deprecationMessage: No longer used. github.action_ref replaces the need for this. Will be removed in a future version.
+    required: false
   additional_templates:
     description: Space delimited list of additional Lorax templates to include
     required: false
@@ -55,7 +55,10 @@ runs:
     - name: Run docker image
       shell: bash
       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 }} \
           IMAGE_NAME=${{ inputs.image_name }} \
           IMAGE_REPO=${{ inputs.image_repo }} \