fix: correctly determine arch (#6609)

Author: viceice

src/usr/local/containerbase/tools/v2/git-lfs.sh

@@ -11,7 +11,7 @@ function install_tool () {
   local lfs_file
   local strip=0
 
-  if [[ "$(uname -p)" = "aarch64" ]]; then
+  if [[ "${ARCHITECTURE}" = "aarch64" ]]; then
     arch=linux-arm64
   fi
 

src/usr/local/containerbase/tools/v2/jb.sh

@@ -4,7 +4,7 @@ function install_tool () {
   local versioned_tool_path
   local file
   local arch=linux-amd64
-  if [[ "$(uname -p)" = "aarch64" ]]; then
+  if [[ "${ARCHITECTURE}" = "aarch64" ]]; then
     arch=linux-arm64
   fi
 

src/usr/local/containerbase/tools/v2/powershell.sh

@@ -19,7 +19,7 @@ function install_tool () {
   local versioned_tool_path
   local arch=linux-x64
 
-  if [[ "$(uname -p)" = "aarch64" ]]; then
+  if [[ "${ARCHITECTURE}" = "aarch64" ]]; then
     arch=linux-arm64
   fi
 

src/usr/local/containerbase/tools/v2/ruby.sh

@@ -77,7 +77,7 @@ function init_tool () {
 }
 
 function install_tool () {
-  local arch
+  local arch=${ARCHITECTURE}
   local base_url
   local checksum_file
   local expected_checksum
@@ -90,7 +90,6 @@ function install_tool () {
 
   tool_path=$(find_tool_path)
 
-  arch=$(uname -p)
   base_url="https://github.com/containerbase/${name}-prebuild/releases/download"
   version_codename=$(get_distro)
 

src/usr/local/containerbase/tools/v2/rust.sh

@@ -35,14 +35,13 @@ function check_tool_requirements () {
 function install_tool () {
   local versioned_tool_path
   local file
-  local arch
+  local arch=${ARCHITECTURE}
   local base_url
   local checksum_file
   local expected_checksum
   local ext=gz
   local file_name
 
-  arch=$(uname -p)
   file_name="rust-${TOOL_VERSION}-${arch}-unknown-linux-gnu.tar"
   base_url="https://static.rust-lang.org/dist/${file_name}"
 

src/usr/local/containerbase/tools/v2/terraform.sh

@@ -5,7 +5,7 @@ function install_tool () {
   local file
   local arch=linux_amd64
 
-  if [[ "$(uname -p)" = "aarch64" ]]; then
+  if [[ "${ARCHITECTURE}" = "aarch64" ]]; then
     arch=linux_arm64
   fi
 

src/usr/local/containerbase/tools/v2/vendir.sh

@@ -5,7 +5,7 @@ function install_tool () {
   local file
   local arch=linux-amd64
 
-  if [[ "$(uname -p)" = "aarch64" ]]; then
+  if [[ "${ARCHITECTURE}" = "aarch64" ]]; then
     arch=linux-arm64
   fi
 

src/usr/local/containerbase/utils/constants.sh

@@ -32,8 +32,9 @@ export CONTAINERBASE_DIR=/usr/local/containerbase
 export CONTAINERBASE_VAR_DIR=/var/lib/containerbase
 export CONTAINERBASE_TMP_DIR=/tmp/containerbase
 
-# Used to find matching tool downloads
-ARCHITECTURE=$(uname -p)
+# Used to find matching tool downloads.
+# `arch` is preinstalled on ubuntu.
+ARCHITECTURE=$(arch)
 export ARCHITECTURE
 
 # Used in util.sh and others.

test/Dockerfile.distro

@@ -32,7 +32,7 @@ RUN install-tool git v2.54.0
 #--------------------------------------
 FROM base AS build
 
-RUN uname -p | tee | grep x86_64
+RUN arch | tee | grep x86_64
 
 RUN touch /.dummy
 

test/dart/Dockerfile.arm64

@@ -24,7 +24,7 @@ RUN install-containerbase
 #--------------------------------------
 FROM ${BASE_IMAGE} AS base
 
-RUN uname -p | tee | grep aarch64
+RUN arch | tee | grep aarch64
 RUN touch /.dummy
 
 ARG APT_HTTP_PROXY