adding ISOs dir and updating workflow

Signed-off-by: greg pereira <[email protected]>
containers · May 6, 2024 · 876485b · 876485b
1 parent 5ab7d7a
commit 876485b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/iso_builder_test.yaml b/.github/workflows/iso_builder_test.yaml
@@ -82,7 +82,7 @@ jobs:
       - name: Run the Image
         working-directory: ./training/iso-builder/
         run: |
-          make iso IMAGE=${{ steps.build_image.outputs.produced_image }} EMBED_IMAGE=${{ steps.build_image.outputs.embedded_image }} ORIGINAL_ISO=ISOs/${{ matrix.iso_name }} SSHKEY=${{ steps.ssh-keygen.outputs.sshpubkey }} CONTAINER_TOOL_EXTRA_ARGS=--pull=never
+          make iso IMAGE=${{ steps.build_image.outputs.produced_image }} EMBED_IMAGE=${{ steps.build_image.outputs.embedded_image }} ORIGINAL_ISO="ISOs/${{ matrix.iso_name }}" SSHKEY="${{ steps.ssh-keygen.outputs.sshpubkey }}" CONTAINER_TOOL_EXTRA_ARGS=--pull=never
 
       # - name: Publish Job Results to Slack
       #   id: slack

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ recipes/common/bin/*
 training/cloud/examples
 training/instructlab/instructlab
 training/iso-builder/ISOs/*
+!training/iso-builder/ISOs/.gitkeep
diff --git a/training/iso-builder/ISOs/.gitkeep b/training/iso-builder/ISOs/.gitkeep
diff --git a/training/iso-builder/Makefile b/training/iso-builder/Makefile
@@ -42,7 +42,7 @@ iso:
 
 	"${CONTAINER_TOOL}" run \
 		--rm \
-		--volume $(shell readlink -f ISOs/${ORIGINAL_ISO}):/root/original.iso:ro \
+		--volume $(shell readlink -f ${ORIGINAL_ISO}):/root/original.iso:ro \
 		--volume ${OUTPUT_DIR}:/output \
 		--volume $(shell ${CONTAINER_TOOL} system info --format json | jq -r '.store.graphRoot'):/var/lib/containers/storage \
 		"${REGISTRY}/${REGISTRY_ORG}/${IMAGE_NAME}:${IMAGE_TAG}" \