Upgrade faster-whisper

jitsi · Aug 21, 2024 · 014257b · 014257b
1 parent 9a60788
commit 014257b
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 109 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-ARG BASE_IMAGE_BUILD=nvidia/cuda:12.3.0-devel-ubuntu20.04
-ARG BASE_IMAGE_RUN=nvidia/cuda:12.3.0-runtime-ubuntu20.04
+ARG BASE_IMAGE_BUILD=nvidia/cuda:12.2.2-cudnn8-devel-ubuntu22.04
+ARG BASE_IMAGE_RUN=nvidia/cuda:12.2.2-cudnn8-runtime-ubuntu22.04
 
 ## Base Image
 ##
@@ -13,7 +13,7 @@ RUN \
 COPY docker/rootfs/ /
 
 RUN \
-    apt-dpkg-wrap apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \
+    apt-dpkg-wrap apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \
     apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y wget build-essential libcurl4-openssl-dev python3.11 python3.11-venv
 
@@ -54,7 +54,7 @@ COPY docker/rootfs/ /
 COPY --chown=jitsi:jitsi docker/run-skynet.sh /opt/
 
 RUN \
-    apt-dpkg-wrap apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \
+    apt-dpkg-wrap apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \
     apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y python3.11 python3.11-venv tini libgomp1 && \
     apt-cleanup
@@ -89,7 +89,7 @@ RUN chown jitsi:jitsi ${PYTHONPATH}
 # Document the exposed port
 EXPOSE 8000
 
-# Use the unpriviledged user to run the application
+# Use the unprivileged user to run the application
 USER 1001
 
 # Use tini as our PID 1

diff --git a/Makefile b/Makefile
@@ -4,29 +4,16 @@ endif
 
 GIT_HASH ?= $(shell git rev-parse --short HEAD)
 PLATFORMS ?= linux/amd64
-CACHE_DIR ?= /tmp/docker-cache
 
 _login:
 	${DOCKER_LOGIN_CMD}
 
-build-summaries : _login
+build : _login
 	docker buildx build \
-	--build-arg="BASE_IMAGE_BUILD=nvidia/cuda:12.3.0-devel-ubuntu20.04" \
-	--build-arg="BASE_IMAGE_RUN=nvidia/cuda:12.3.0-runtime-ubuntu20.04" \
 	--progress plain \
 	--push \
 	--platform ${PLATFORMS} \
-	--cache-from type=local,src=${CACHE_DIR} \
-	--cache-to type=local,dest=${CACHE_DIR},mode=max \
-	-t ${IMAGE_REGISTRY}/skynet:summaries-${GIT_HASH} .
-
-build-whisper : _login
-	docker buildx build \
-	--build-arg="BASE_IMAGE_BUILD=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04" \
-	--build-arg="BASE_IMAGE_RUN=nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04" \
-	--progress plain \
-	--platform ${PLATFORMS} \
-	--push \
-	--cache-from type=local,src=${CACHE_DIR} \
-	--cache-to type=local,dest=${CACHE_DIR},mode=max \
-	-t ${IMAGE_REGISTRY}/skynet:whisper-${GIT_HASH} .
+	-t ${IMAGE_REGISTRY}/skynet:summaries-${GIT_HASH} \
+	-t ${IMAGE_REGISTRY}/skynet:whisper-${GIT_HASH} \
+	-t ${IMAGE_REGISTRY}/skynet:${GIT_HASH} \
+	-t ${IMAGE_REGISTRY}/skynet:latest .
diff --git a/docker/rootfs/etc/apt/sources.list.d/python-ppa.list b/docker/rootfs/etc/apt/sources.list.d/python-ppa.list
@@ -1,2 +1 @@
-deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu focal main
-deb-src https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu focal main
+deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu jammy main