From fa5263b661ebe91d812d57ce58b9de7c75ea4a14 Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Tue, 29 Apr 2025 11:44:02 +0200 Subject: [PATCH] Revert "introduce IMAGE_ARCH" This reverts commit 2e63fbe25cfaf3f04327c2d77997a49e75a6ad36. Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- modules/kind/kind-image-preload.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/kind/kind-image-preload.mk b/modules/kind/kind-image-preload.mk index dc9256c8..a876bbdb 100644 --- a/modules/kind/kind-image-preload.mk +++ b/modules/kind/kind-image-preload.mk @@ -26,11 +26,9 @@ endif ########################################## -IMAGE_ARCH ?= $(HOST_ARCH) +images := $(images_$(HOST_ARCH)) -images := $(images_$(IMAGE_ARCH)) - -images_tar_dir := $(bin_dir)/downloaded/containers/$(IMAGE_ARCH) +images_tar_dir := $(bin_dir)/downloaded/containers/$(HOST_ARCH) images_tars := $(foreach image,$(images),$(images_tar_dir)/$(subst :,+,$(image)).tar) # Download the images as tarballs. After downloading the image using @@ -51,7 +49,7 @@ $(images_tars): $(images_tar_dir)/%.tar: | $(NEEDS_IMAGE-TOOL) $(NEEDS_CRANE) $( @$(eval digest=$(word 2,$(subst @, ,$(full_image)))) @$(eval tag=$(word 2,$(subst :, ,$(word 1,$(subst @, ,$(full_image)))))) @mkdir -p $(dir $@) - $(CRANE) pull "$(bare_image)@$(digest)" $@ --platform=linux/$(IMAGE_ARCH) + $(CRANE) pull "$(bare_image)@$(digest)" $@ --platform=linux/$(HOST_ARCH) $(IMAGE-TOOL) tag-docker-tar $@ "$(bare_image):$(tag)" # $1 = image