Merge commit '855bd9aece5740b957efa385fadb99fb0a683402' into v1.25
This commit is contained in:
commit
823aa70e35
@ -10,9 +10,6 @@ ifeq (,$(filter main master, $(GIT_BRANCH)))
|
||||
endif
|
||||
endif
|
||||
|
||||
# optionally set by the caller
|
||||
EXTRA_TAGS :=
|
||||
|
||||
ARCH := amd64
|
||||
ALL_ARCHS := amd64 arm64
|
||||
_ARCH = $(or $(filter $(ARCH),$(ALL_ARCHS)),$(error $$ARCH [$(ARCH)] must be exactly one of "$(ALL_ARCHS)"))
|
||||
|
Loading…
Reference in New Issue
Block a user