From 3a341a863a6c753ee55b5ec6dfcc2142b9718e4c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 8 Oct 2024 10:11:50 -0400 Subject: [PATCH] Fix subdir tree of Containerfiles Subtree structure was adding nothing to information about Containerfiles. I see us ending up with 4 subdirs cpuonly cuda rocm vulkan And then perhaps adding others in the future. Signed-off-by: Daniel J Walsh --- .github/workflows/latest.yml | 2 +- .github/workflows/nightly.yml | 2 +- container-images/{ramalama/latest => cpuonly}/Containerfile | 0 container-images/{ramalama/latest-cuda => cuda}/Containerfile | 0 container_build.sh | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename container-images/{ramalama/latest => cpuonly}/Containerfile (100%) rename container-images/{ramalama/latest-cuda => cuda}/Containerfile (100%) diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml index ab9a4953..1c43f2c6 100644 --- a/.github/workflows/latest.yml +++ b/.github/workflows/latest.yml @@ -50,7 +50,7 @@ jobs: image: quay.io/ramalama/ramalama tags: latest containerfiles: | - container-images/ramalama/latest/Containerfile + container-images/cpuonly/Containerfile platforms: linux/amd64, linux/arm64 - name: push images to registry diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d2d7f2c8..000dce6d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -50,7 +50,7 @@ jobs: image: quay.io/ramalama/ramalama tags: nightly containerfiles: | - container-images/ramalama/latest/Containerfile + container-images/cpuonly/Containerfile platforms: linux/amd64, linux/arm64 - name: push images to registry diff --git a/container-images/ramalama/latest/Containerfile b/container-images/cpuonly/Containerfile similarity index 100% rename from container-images/ramalama/latest/Containerfile rename to container-images/cpuonly/Containerfile diff --git a/container-images/ramalama/latest-cuda/Containerfile b/container-images/cuda/Containerfile similarity index 100% rename from container-images/ramalama/latest-cuda/Containerfile rename to container-images/cuda/Containerfile diff --git a/container_build.sh b/container_build.sh index 5a2fbcc0..5979ac03 100755 --- a/container_build.sh +++ b/container_build.sh @@ -53,7 +53,7 @@ main() { platform="linux/arm64" fi - for i in container-images/*/*; do + for i in container-images/*; do build "$i" "$@" done }