From 5b13e45e2878c30f9f7c59d07084df74be9686be Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 24 Apr 2024 13:16:13 -0400 Subject: [PATCH] Add -bootc identifier to training images Also set default image in Containerfile and do not set it in Makefile. Signed-off-by: Daniel J Walsh --- training/amd/Makefile | 7 +++---- training/nvidia/Makefile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/training/amd/Makefile b/training/amd/Makefile index 56768580..ad4fd866 100644 --- a/training/amd/Makefile +++ b/training/amd/Makefile @@ -1,8 +1,8 @@ -FROM ?= "quay.io/centos-bootc/centos-bootc:stream9" +FROM ?= REGISTRY ?= quay.io REGISTRY_ORG ?= ai-lab -IMAGE_NAME ?= amd +IMAGE_NAME ?= amd-bootc IMAGE_TAG ?= latest CONTAINER_TOOL ?= podman @@ -13,6 +13,5 @@ image: "${CONTAINER_TOOL}" build \ --file Containerfile \ --tag "${REGISTRY}/${REGISTRY_ORG}/${IMAGE_NAME}:${IMAGE_TAG}" \ - --from "${FROM}" \ + $(FROM:%=--from=%) \ ${CONTAINER_TOOL_EXTRA_ARGS} - diff --git a/training/nvidia/Makefile b/training/nvidia/Makefile index ba446e2e..0e9b8cd7 100644 --- a/training/nvidia/Makefile +++ b/training/nvidia/Makefile @@ -2,7 +2,7 @@ FROM ?= REGISTRY ?= quay.io REGISTRY_ORG ?= ai-lab -IMAGE_NAME ?= nvidia +IMAGE_NAME ?= nvidia-bootc IMAGE_TAG ?= latest DTK_IMAGE_NAME ?= nvidia-builder DTK_IMAGE_TAG ?= latest