@@ -39,7 +39,7 @@ SHELL := /usr/bin/env bash
3939PROJECT_NAME ?= vllm-sim
4040DEV_VERSION ?= 0.0.1
4141PROD_VERSION ?= 0.0.0
42- IMAGE_TAG_BASE ?= quay.io/vllm -d/$(PROJECT_NAME )
42+ IMAGE_TAG_BASE ?= quay.io/llm -d/$(PROJECT_NAME )
4343IMG = $(IMAGE_TAG_BASE ) :$(DEV_VERSION )
4444NAMESPACE ?= hc4ai-operator
4545
@@ -92,16 +92,23 @@ buildah-build: check-builder load-version-json ## Build and push image (multi-ar
9292 @echo " ✅ Using builder: $( BUILDER) "
9393 @if [ " $( BUILDER) " = " buildah" ]; then \
9494 echo " 🔧 Buildah detected: Performing multi-arch build..." ; \
95+ FINAL_TAG=$(IMG ) ; \
9596 for arch in amd64; do \
97+ ARCH_TAG=$$ FINAL_TAG-$$ arch; \
9698 echo " 📦 Building for architecture: $$ arch" ; \
97- buildah build --arch=$$ arch --os=linux -t $(IMG ) -$$ arch . || exit 1; \
98- echo " 🚀 Pushing image: $( IMG ) - $$ arch " ; \
99- buildah push $( IMG ) - $$ arch docker://$( IMG ) - $$ arch || exit 1; \
99+ buildah build --arch=$$ arch --os=linux --layers -t $(IMG ) -$$ arch . || exit 1; \
100+ echo " 🚀 Pushing image: $$ ARCH_TAG " ; \
101+ buildah push $$ ARCH_TAG docker://$$ ARCH_TAG || exit 1; \
100102 done ; \
101- echo " 🧱 Creating and pushing manifest list: $( IMG) " ; \
102- buildah manifest create $(IMG ) ; \
103- buildah manifest add $(IMG ) $(IMG ) -amd64; \
104- buildah manifest push --all $(IMG ) docker://$(IMG ) ; \
103+ echo " 🧼 Removing existing manifest (if any)..." ; \
104+ buildah manifest rm $$ FINAL_TAG || true ; \
105+ echo " 🧱 Creating and pushing manifest list: $$ FINAL_TAG" ; \
106+ buildah manifest create $$ FINAL_TAG; \
107+ for arch in amd64; do \
108+ ARCH_TAG=$$ FINAL_TAG-$$ arch; \
109+ buildah manifest add $$ FINAL_TAG $$ ARCH_TAG; \
110+ done ; \
111+ buildah manifest push --all $$ FINAL_TAG docker://$$ FINAL_TAG; \
105112 elif [ " $( BUILDER) " = " docker" ]; then \
106113 echo " 🐳 Docker detected: Building with buildx..." ; \
107114 sed -e ' 1 s/\(^FROM\)/FROM --platform=$${BUILDPLATFORM}/' Dockerfile > Dockerfile.cross; \
@@ -259,7 +266,7 @@ load-version-json: check-jq
259266 export DEV_VERSION; \
260267 export PROD_VERSION; \
261268 fi && \
262- CURRENT_DEFAULT=" quay.io/vllm -d/$( PROJECT_NAME) " ; \
269+ CURRENT_DEFAULT=" quay.io/llm -d/$( PROJECT_NAME) " ; \
263270 if [ " $( IMAGE_TAG_BASE) " = " $$ CURRENT_DEFAULT" ]; then \
264271 IMAGE_TAG_BASE=$$(jq -r '."dev-registry"' .version.json ) ; \
265272 echo " ✔ Loaded IMAGE_TAG_BASE from .version.json: $$ IMAGE_TAG_BASE" ; \
0 commit comments