commit 9096c694b3842fa134608230edf68e2cd243b61f
author Andrew Geissler <geissonator@yahoo.com> Wed Oct 02 16:36:17 2024 -0400
committer Andrew Geissler <geissonator@yahoo.com> Mon Oct 07 13:57:47 2024 -0400
tree c92cc436dff4d01f68d26b106581007468eed7a9
parent c7fb191d18f43128863cdf42e5f6efb130445f97

docker: remove architecture checks

Docker containers now handle this under the covers when you pull a
container.

Change-Id: If0062f68c53ca79735dd841ae06236c34911e081
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

build-setup.sh

diff --git a/build-setup.sh b/build-setup.sh
index fecf0dc..1a3255f 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -115,25 +115,6 @@
         echo \"deb ${UBUNTU_MIRROR} \$(. /etc/os-release && echo \$VERSION_CODENAME)-backports main restricted universe multiverse\" >> /etc/apt/sources.list"
 fi
 
-# Determine the architecture
-ARCH=$(uname -m)
-
-# Determine the prefix of the Dockerfile's base image
-case ${ARCH} in
-    "ppc64le")
-        DOCKER_BASE="ppc64le/"
-        ;;
-    "x86_64")
-        DOCKER_BASE=""
-        ;;
-    "aarch64")
-        DOCKER_BASE="arm64v8/"
-        ;;
-    *)
-        echo "Unsupported system architecture(${ARCH}) found for docker image"
-        exit 1
-esac
-
 # Timestamp for job
 echo "Build started, $(date)"
 
@@ -176,7 +157,7 @@
     fi
 
     Dockerfile=$(cat << EOF
-  FROM ${DOCKER_BASE}${distro}:${img_tag}
+  FROM ${distro}:${img_tag}
 
   ${PROXY}
 
@@ -230,7 +211,7 @@
     fi
 
     Dockerfile=$(cat << EOF
-  FROM ${DOCKER_BASE}${distro}:${img_tag}
+  FROM ${distro}:${img_tag}
 
   ${PROXY}
   ${MIRROR}