From ebe62afcb4e0ae918212aab80e2747bc7b863d5d Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Thu, 4 Jul 2024 04:46:57 +0800 Subject: [PATCH] fix (#19466) Why I did it DEFAULT_CONTAINER_REGISTRY didn't work as expected in some scenario. How I did it When check for docker arch, use DEFAULT_CONTAINER_REGISTRY if it is not null. --- Makefile.work | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.work b/Makefile.work index f3c9a740dc6e..1a803bd875b3 100644 --- a/Makefile.work +++ b/Makefile.work @@ -71,7 +71,11 @@ SHELL = /bin/bash USER := $(shell id -un) PWD := $(shell pwd) USER_LC := $(shell echo $(USER) | tr A-Z a-z) +ifneq ($(DEFAULT_CONTAINER_REGISTRY),) +DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m) +else DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m) +endif comma := ,