docker: add arch to image tag

Signed-off-by: Vitor Bandeira <vvbandeira@precisioninno.com>
vvbandeira · Aug 22, 2024 · fe4c560 · fe4c560
1 parent 0c94f6f
commit fe4c560
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/etc/DockerHelper.sh b/etc/DockerHelper.sh
@@ -53,7 +53,7 @@ _setup() {
     esac
     imageName="${IMAGE_NAME_OVERRIDE:-"${org}/flow-${os}-${target}"}"
     if [[ "${tag}" != "" ]]; then
-        imageTag="${tag}"
+        imageTag="${tag}-$(uname -m)"
     else
         imageTag=$(./etc/DockerTag.sh -dev)
     fi

diff --git a/etc/DockerTag.sh b/etc/DockerTag.sh
@@ -17,10 +17,11 @@ if [[ "$@" == "-dev" ]]; then
         "./tools/OpenROAD/etc/DockerHelper.sh"
         "./tools/OpenROAD/etc/DockerTag.sh"
     )
-    cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}'
+    ret=$(cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}')
 elif [[ "$@" == "-master" ]]; then
-    git describe
+    ret=$(git describe)
 else
     echo "Usage: $0 {-dev|-master}"
     exit 1
 fi
+echo "${ret}-$(uname -m)"