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>

qemu-build.sh

diff --git a/qemu-build.sh b/qemu-build.sh
index a00947d..3e5f422 100755
--- a/qemu-build.sh
+++ b/qemu-build.sh
@@ -34,9 +34,6 @@
     exit 1
 fi
 
-# Determine the architecture
-ARCH=$(uname -m)
-
 # Docker Image Build Variables:
 img_name=qemu-build
 
@@ -48,22 +45,6 @@
     PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy"
 fi
 
-# 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
-
 # Create the docker run script
 export PROXY_HOST=${http_proxy/#http*:\/\/}
 export PROXY_HOST=${PROXY_HOST/%:[0-9]*}
@@ -108,7 +89,7 @@
 # !!!
 
 Dockerfile=$(cat << EOF
-FROM ${DOCKER_BASE}ubuntu:jammy
+FROM ubuntu:jammy
 
 ${PROXY}