Skip to content

Commit 01f8036

Browse files
Merge pull request #287 from inteon/image_variables
Revert "introduce IMAGE_ARCH"
2 parents 1373fbc + fa5263b commit 01f8036

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

modules/kind/kind-image-preload.mk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ endif
2626

2727
##########################################
2828

29-
IMAGE_ARCH ?= $(HOST_ARCH)
29+
images := $(images_$(HOST_ARCH))
3030

31-
images := $(images_$(IMAGE_ARCH))
32-
33-
images_tar_dir := $(bin_dir)/downloaded/containers/$(IMAGE_ARCH)
31+
images_tar_dir := $(bin_dir)/downloaded/containers/$(HOST_ARCH)
3432
images_tars := $(foreach image,$(images),$(images_tar_dir)/$(subst :,+,$(image)).tar)
3533

3634
# 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) $(
5149
@$(eval digest=$(word 2,$(subst @, ,$(full_image))))
5250
@$(eval tag=$(word 2,$(subst :, ,$(word 1,$(subst @, ,$(full_image))))))
5351
@mkdir -p $(dir $@)
54-
$(CRANE) pull "$(bare_image)@$(digest)" $@ --platform=linux/$(IMAGE_ARCH)
52+
$(CRANE) pull "$(bare_image)@$(digest)" $@ --platform=linux/$(HOST_ARCH)
5553
$(IMAGE-TOOL) tag-docker-tar $@ "$(bare_image):$(tag)"
5654

5755
# $1 = image

0 commit comments

Comments
 (0)