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-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 7cf6581  [YUNIKORN-1810] Use arm64 without variant for DOCKER_ARCH 
(#148)
7cf6581 is described below

commit 7cf6581600ce048789dd7c1002c8fcbf951ea9e9
Author: Wilfred Spiegelenburg <[email protected]>
AuthorDate: Mon Jun 19 17:49:18 2023 +1000

    [YUNIKORN-1810] Use arm64 without variant for DOCKER_ARCH (#148)
    
    Building multi architecture image fails to properly split the variant
    from the main architecture and binary does not change without variant.
    
    Closes: #148
    
    Signed-off-by: Wilfred Spiegelenburg <[email protected]>
---
 tools/build-image.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/build-image.py b/tools/build-image.py
index 0de221c..c23994d 100755
--- a/tools/build-image.py
+++ b/tools/build-image.py
@@ -27,7 +27,7 @@ import sys
 # Supported host architectures for executables and docker images
 # Mapped to the correct settings in the Makefile
 architecture = {"x86_64": "amd64",
-                "aarch64": "arm64v8"}
+                "aarch64": "arm64"}
 # Make targets for the shim repo to generate the images
 targets = {"adm_image": "admission",
            "sched_image": "scheduler",
@@ -172,6 +172,8 @@ def build_manifest(manifest, version):
     for arch in architecture:
         image_name = create_image_name(manifest, version, architecture[arch])
         print(" - image:    %s" % image_name)
+        # image_manifest = create_image_name(manifest, version, 
manifestmap[arch])
+        # print(" - image manifest:    %s" % image_manifest)
         # temporary push to create tag to allow manifest build
         # https://github.com/docker/cli/issues/3350
         push_image(cmd, image_name)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to