From 14f9542620544679cca876f50e7753b8a6766d63 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Wed, 20 Nov 2024 11:42:34 -0700
Subject: [PATCH] Update python

---
 docker/main/Dockerfile      |  8 ++++----
 docker/main/install_deps.sh | 12 ++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 02c304823..9d9e8e093 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -149,8 +149,8 @@ RUN apt-get -qq update \
     tee /etc/apt/sources.list.d/debian-bullseye-nonfree.list \
     && apt-get -qq update \
     && apt-get -qq install -y \
-    python3.9 \
-    python3.9-dev \
+    python3.10 \
+    python3.10-dev \
     # opencv dependencies
     build-essential cmake git pkg-config libgtk-3-dev \
     libavcodec-dev libavformat-dev libswscale-dev libv4l-dev \
@@ -164,8 +164,8 @@ RUN apt-get -qq update \
     gcc gfortran libopenblas-dev liblapack-dev && \
     rm -rf /var/lib/apt/lists/*
 
-# Ensure python3 defaults to python3.9
-RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
+# Ensure python3 defaults to python3.10
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1
 
 RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
     && python3 get-pip.py "pip"
diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index 6c32ae168..1c50bb9a7 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -11,15 +11,15 @@ apt-get -qq install --no-install-recommends -y \
     lbzip2 \
     procps vainfo \
     unzip locales tzdata libxml2 xz-utils \
-    python3.9 \
+    python3.10 \
     python3-pip \
     curl \
     lsof \
     jq \
     nethogs
 
-# ensure python3 defaults to python3.9
-update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
+# ensure python3 defaults to python3.10
+update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1
 
 mkdir -p -m 600 /root/.gnupg
 
@@ -65,9 +65,7 @@ fi
 
 # arch specific packages
 if [[ "${TARGETARCH}" == "amd64" ]]; then
-    # use debian bookworm for amd / intel-i965 driver packages
-    echo 'deb https://deb.debian.org/debian bookworm main contrib non-free' >/etc/apt/sources.list.d/debian-bookworm.list
-    apt-get -qq update
+    # install amd / intel-i965 driver packages
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
         i965-va-driver intel-gpu-tools onevpl-tools \
         libva-drm2 \
@@ -80,8 +78,6 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
     # intel packages use zst compression so we need to update dpkg
     apt-get install -y dpkg
 
-    rm -f /etc/apt/sources.list.d/debian-bookworm.list
-
     # use intel apt intel packages
     wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics.gpg
     echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy client" | tee /etc/apt/sources.list.d/intel-gpu-jammy.list