Update balenalib bullseye Dockerfiles

There is a balenalib/armv7hf-debian:bullseye now - use it instead of 'sid'.

docker/Dockerfile.balenalib-raspberrypi3-debian-bullseye-build

@@ -1,8 +1,8 @@
 # Use this Dockerfile to build a Debian 11 (Bullseye) version of balenalib while
 # there is no such version yet officially.
 #
-# from https://github.com/balena-io-library/base-images/blob/master/balena-base-images/device-base/raspberrypi3/debian/sid/build/Dockerfile
-FROM balenalib/armv7hf-debian:sid-build
+# from https://github.com/balena-io-library/base-images/blob/master/balena-base-images/device-base/raspberrypi3/debian/bullseye/build/Dockerfile
+FROM balenalib/armv7hf-debian:bullseye-build
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 LABEL io.balena.device-type="raspberrypi3"
 RUN echo "deb http://archive.raspbian.org/raspbian bullseye main contrib non-free rpi firmware" >>  /etc/apt/sources.list \

docker/Dockerfile.balenalib-raspberrypi3-debian-bullseye-run

@@ -1,8 +1,8 @@
 # Use this Dockerfile to build a Debian 11 (Bullseye) version of balenalib while
 # there is no such version yet officially.
 #
-# from https://github.com/balena-io-library/base-images/blob/master/balena-base-images/device-base/raspberrypi3/debian/sid/run/Dockerfile
-FROM balenalib/armv7hf-debian:sid-run
+# from https://github.com/balena-io-library/base-images/blob/master/balena-base-images/device-base/raspberrypi3/debian/bullseye/run/Dockerfile
+FROM balenalib/armv7hf-debian:bullseye-run
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 LABEL io.balena.device-type="raspberrypi3"
 RUN echo "deb http://archive.raspbian.org/raspbian bullseye main contrib non-free rpi firmware" >>  /etc/apt/sources.list \

docker/Dockerfile.build-env

@@ -75,11 +75,12 @@ RUN set -x \
     && rm -rf /var/lib/apt/lists/*
 
 # Install openjdk-8-jdk.
-# Buster version crashes on AWS EC2 ARM instances and QMU emulator on x86, so we
-# source the version from the stretch package depo instead, which works fine.
+# Buster/bullseye version crashes on AWS EC2 ARM instances and QMU emulator on
+# x86, so we source the version from the stretch package depo instead, which
+# works fine.
 # hadolint ignore=DL3008,DL3015
 RUN set -x; \
-    if [[ "${DEBIAN_VERSION}" == 'buster' ]]; then \
+    if [[ "${DEBIAN_VERSION}" =~ (buster|bullseye)  ]]; then \
       echo "deb http://archive.raspbian.org/raspbian stretch main" > /etc/apt/sources.list.d/raspbian-stretch.list; \
     fi \
     && apt-get update \

docker/Dockerfile.server

@@ -193,9 +193,10 @@ RUN set -x \
        pandoc \
        pandoc-citeproc \
        texlive-latex-extra \
-       texlive-generic-extra \
        texlive-fonts-recommended \
        lmodern \
+    # bullseye provisional balenalib image doesn't have this; don't fail
+    && (apt-get install -y texlive-generic-extra || true) \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*