Skip to content

Commit 2b63559

Browse files
[202205, build] When check for docker arch, use DEFAULT_CONTAINER_REGISTRY if it is not null (sonic-net#19466) (sonic-net#19565)
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. Co-authored-by: Liu Shilong <[email protected]>
1 parent 171704c commit 2b63559

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

Makefile.work

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ SHELL = /bin/bash
6262
USER := $(shell id -un)
6363
PWD := $(shell pwd)
6464
USER_LC := $(shell echo $(USER) | tr A-Z a-z)
65+
ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
66+
DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m)
67+
else
6568
DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
69+
endif
6670

6771
comma := ,
6872

0 commit comments

Comments
 (0)