Automagically use i386/debian:buster (RPi-Distro#415)

* Autmagically use 1386/debian:buster when running on 64-bit host to prevent error RPi-Distro#271 (cherry picked from commit dd96ca1)
analogdevicesinc · May 29, 2023 · 08127fc · 08127fc
1 parent e60b47c
commit 08127fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM i386/debian:buster
+ARG BASE_IMAGE=debian:buster
+FROM ${BASE_IMAGE}
 
 ENV DEBIAN_FRONTEND noninteractive
 

diff --git a/build-docker.sh b/build-docker.sh
@@ -83,10 +83,10 @@ BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 # Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead
 case "$(uname -m)" in
   x86_64|aarch64)
-    BASE_IMAGE=i386/debian:bullseye
+    BASE_IMAGE=i386/debian:buster
     ;;
   *)
-    BASE_IMAGE=debian:bullseye
+    BASE_IMAGE=debian:buster
     ;;
 esac
 ${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"