manibuilder: Switch Dockerfile.anita to Bullseye and Python 3

Basing the image on debian:stable turned out to be a bad idea once
stable switched to Bullseye. Instead of falling back to Buster, we
move forward to Bullseye and pin that version. Hopefully that works
for some years again.

With Bullseye it turned out to be easier to do things with Python 3,
so we use that now. To ease future changes, we use tinier RUN and ARG
steps which creates more intermediate images. Such intermediate images
can be reused if some later step is changed in the Dockerfile.

Change-Id: Ic064ddad807329a9bd81085775190615ad89273f
Signed-off-by: Nico Huber <nico.h@gmx.de>
Ticket: https://ticket.coreboot.org/issues/383
Reviewed-on: https://review.coreboot.org/c/flashrom/+/65633
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
---
M util/manibuilder/Dockerfile.anita
1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/util/manibuilder/Dockerfile.anita b/util/manibuilder/Dockerfile.anita
index f4b1309..6ef41b9 100644
--- a/util/manibuilder/Dockerfile.anita
+++ b/util/manibuilder/Dockerfile.anita
@@ -1,22 +1,22 @@
-FROM debian:stable
+FROM debian:bullseye
 
 ARG PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/7.1/All
 ARG INST_IMG=http://ftp.de.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/
-ARG DISK_SIZE=1G
-ARG INSTALL_MEM=128M
-ARG EXTRA_PKG=""
 
 RUN \
 	useradd -p locked -m mani && \
 	apt-get -qq update && \
 	apt-get -qq upgrade && \
 	apt-get -qq dist-upgrade && \
-	apt-get -qqy install git python python-pexpect \
-			     genisoimage qemu-system && \
-	apt-get clean && \
-	git clone https://github.com/gson1703/anita.git && \
-	cd anita && python setup.py install
+	apt-get -qqy install git python-is-python3 python3-pexpect \
+			     python3-distutils genisoimage qemu-system && \
+	apt-get clean
 
+RUN	git clone https://github.com/gson1703/anita.git
+RUN	cd anita && python setup.py install
+
+ARG DISK_SIZE=1G
+ARG INSTALL_MEM=128M
 USER mani
 RUN cd && mkdir .ccache && chown mani:mani .ccache && \
 	  anita --sets kern-GENERIC,modules,base,etc,comp \
@@ -24,6 +24,7 @@
 		install ${INST_IMG} && \
 	  rm -rf work-*/download
 
+ARG EXTRA_PKG=""
 ARG RUNTIME_MEM=128M
 RUN cd && anita --persist --memory-size=${RUNTIME_MEM} --run \
 "echo 'dhcpcd'                                   >init && \

