From 58d4d038b4ad9a84ee6f41080d5681f7df6fd6e0 Mon Sep 17 00:00:00 2001
From: HubbeKing <github@hubbe.club>
Date: Wed, 13 Nov 2024 09:09:23 +0200
Subject: [PATCH] Update buscribe to debian:12 to make it build on arm64

---
 build               | 29 +++++++++--------------------
 buscribe/Dockerfile |  4 +++-
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/build b/build
index 9ed9e77..33a6889 100755
--- a/build
+++ b/build
@@ -54,7 +54,7 @@ case "${CACHE:-}" in
 		BUILD_CMD="docker"
 		;;
 	readonly)
-		CACHE_ARGS+=("--cache-from" "$CACHE_NAME")
+		CACHE_ARGS+=("--layers" "--cache-from" "$CACHE_NAME")
 		BUILD_CMD="buildah"
 		;;
 	*)
@@ -76,25 +76,14 @@ for component in "${COMPONENTS[@]}"; do
 	latest="$BASE/wubloader-$component:latest"
 	specific="$BASE/wubloader-$component:$TAG"
 	if [ -n "$MULTIPLATFORM" ]; then
-		# buscribe doesn't (yet?) build under arm64 due to pulling in libc-bin, skip arm64 for it
-		if [ "$component" != "buscribe" ]; then
-			"$BUILD_CMD" build \
-				-f "$component/Dockerfile" \
-				--manifest "$specific" \
-				--manifest "$latest" \
-				--jobs 2 \
-				--platform=linux/amd64,linux/arm64 \
-				"${CACHE_ARGS[@]}" \
-				.
-		else
-			"$BUILD_CMD" build \
-				-f "$component/Dockerfile" \
-				--manifest "$specific" \
-				--manifest "$latest" \
-				--platform=linux/amd64 \
-				"${CACHE_ARGS[@]}" \
-				.
-		fi
+		"$BUILD_CMD" build \
+			-f "$component/Dockerfile" \
+			--manifest "$specific" \
+			--manifest "$latest" \
+			--jobs 2 \
+			--platform=linux/amd64,linux/arm64 \
+			"${CACHE_ARGS[@]}" \
+			.
 	else
 		"$BUILD_CMD" build \
 			-f "$component/Dockerfile" \
diff --git a/buscribe/Dockerfile b/buscribe/Dockerfile
index 24e8eba..45496ce 100644
--- a/buscribe/Dockerfile
+++ b/buscribe/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:11
+FROM debian:12
 
 RUN apt update &&\
     apt install -y python3 libpq-dev python3-pip curl unzip ffmpeg
@@ -14,6 +14,8 @@ RUN cd /tmp \
 	&& unzip vosk-model-spk-0.4.zip -d /usr/share/buscribe \
 	&& rm *.zip
 
+RUN rm /usr/lib/python3.11/EXTERNALLY-MANAGED
+
 COPY common /tmp/common
 RUN pip install /tmp/common && rm -r /tmp/common