This is an automated email from the ASF dual-hosted git repository.
wilfreds pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-web.git
The following commit(s) were added to refs/heads/master by this push:
new c8d3407 [YUNIKORN-1810] Use arm64 without variant for DOCKER_ARCH
(#122)
c8d3407 is described below
commit c8d340755e94a07c8e37a8228fd61d377143bc4a
Author: Wilfred Spiegelenburg <[email protected]>
AuthorDate: Mon Jun 19 17:50:06 2023 +1000
[YUNIKORN-1810] Use arm64 without variant for DOCKER_ARCH (#122)
Building multi architecture image fails to properly split the variant
from the main architecture and binary does not change without variant.
Closes: #122
Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index f044973..24b37ab 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
# Check if this GO tools version used is at least the version of go specified
in
# the go.mod file. The version in go.mod should be in sync with other repos.
GO_VERSION := $(shell go version | awk '{print substr($$3, 3, 10)}')
-MOD_VERSION := $(shell cat .go_version)
+MOD_VERSION := $(shell cat .go_version)
GM := $(word 1,$(subst ., ,$(GO_VERSION)))
MM := $(word 1,$(subst ., ,$(MOD_VERSION)))
@@ -75,7 +75,7 @@ EXEC_ARCH := 386
DOCKER_ARCH := i386
else ifneq (,$(filter $(HOST_ARCH), arm64 aarch64))
EXEC_ARCH := arm64
-DOCKER_ARCH := arm64v8
+DOCKER_ARCH := arm64
else ifeq (armv7l, $(HOST_ARCH))
EXEC_ARCH := arm
DOCKER_ARCH := arm32v7
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
