From bfd5ced6d50399cf4e81ddd036cd4b7646b3b280 Mon Sep 17 00:00:00 2001 From: Luigi Cruz Date: Tue, 9 Nov 2021 15:39:30 -0300 Subject: [PATCH] use native docker image to build --- build-docker.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index 2f8d49a..79032a5 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -75,22 +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) - case "$(uname -m)" in - aarch64) - BASE_IMAGE=arm32v7/debian:bullseye - ;; - *) - BASE_IMAGE=i386/debian:bullseye - ;; - esac - ;; - *) - BASE_IMAGE=debian:bullseye - ;; -esac +BASE_IMAGE=debian:bullseye ${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}" if [ "${CONTAINER_EXISTS}" != "" ]; then