Skip to content

Commit

Permalink
Switch docker build to Debian Bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanb2 committed Oct 18, 2023
1 parent 0ef867e commit a9b02d4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,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:bookworm
;;
*)
BASE_IMAGE=debian:bullseye
BASE_IMAGE=debian:bookworm
;;
esac
${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"
Expand Down Expand Up @@ -154,7 +154,7 @@ time ${DOCKER} run \
pi-gen \
bash -e -o pipefail -c "
dpkg-reconfigure qemu-user-static &&
# binfmt_misc is sometimes not mounted with debian bullseye image
# binfmt_misc is sometimes not mounted with debian bookworm image
(mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true) &&
cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
rsync -av work/*/build.log deploy/
Expand Down

0 comments on commit a9b02d4

Please sign in to comment.