From ca06d62f2ef63bd00b5729e48c64a2688e46ae14 Mon Sep 17 00:00:00 2001 From: XECDesign Date: Mon, 25 Apr 2022 15:11:28 +0100 Subject: [PATCH] Docker: always use debian:bullseye for arm64 image Fixes #613 --- build-docker.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index a7f18f1..a44b33f 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -75,16 +75,7 @@ fi # Modify original build-options to allow config file to be mounted in the docker container 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=debian:bullseye - ;; -esac -${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}" +${DOCKER} build --build-arg BASE_IMAGE=debian:bullseye -t pi-gen "${DIR}" if [ "${CONTAINER_EXISTS}" != "" ]; then trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM