From 94a9dcede892ad46b5ecb3f1356ec2564c14e887 Mon Sep 17 00:00:00 2001
From: Lander Noterman <lander.noterman@basalte.be>
Date: Thu, 20 Feb 2025 13:29:22 +0100
Subject: [PATCH] JetPack 6: fix BASE_HOOK (#16701)

---
 docker/main/Dockerfile      | 10 +++++++---
 docker/main/install_deps.sh |  2 +-
 docker/tensorrt/trt.hcl     | 13 +++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 0bafeab80..d346b3597 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -14,16 +14,18 @@ ARG BASE_HOOK=
 
 FROM ${BASE_IMAGE} AS base
 ARG PIP_BREAK_SYSTEM_PACKAGES
+ARG BASE_HOOK
 
-RUN ${BASE_HOOK}
+RUN sh -c "$BASE_HOOK"
 
 FROM --platform=${BUILDPLATFORM} debian:12 AS base_host
 ARG PIP_BREAK_SYSTEM_PACKAGES
 
 FROM ${SLIM_BASE} AS slim-base
 ARG PIP_BREAK_SYSTEM_PACKAGES
+ARG BASE_HOOK
 
-RUN ${BASE_HOOK}
+RUN sh -c "$BASE_HOOK"
 
 FROM slim-base AS wget
 ARG DEBIAN_FRONTEND
@@ -229,8 +231,10 @@ ENV PATH="/usr/local/go2rtc/bin:/usr/local/tempio/bin:/usr/local/nginx/sbin:${PA
 RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
     /deps/install_deps.sh
 
+RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
+    && python3 get-pip.py "pip"
+
 RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \
-    python3 -m pip install --upgrade pip && \
     pip3 install -U /deps/wheels/*.whl
 
 COPY --from=deps-rootfs / /
diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh
index a7b7789c0..def611080 100755
--- a/docker/main/install_deps.sh
+++ b/docker/main/install_deps.sh
@@ -6,13 +6,13 @@ apt-get -qq update
 
 apt-get -qq install --no-install-recommends -y \
     apt-transport-https \
+    ca-certificates \
     gnupg \
     wget \
     lbzip2 \
     procps vainfo \
     unzip locales tzdata libxml2 xz-utils \
     python3.11 \
-    python3-pip \
     curl \
     lsof \
     jq \
diff --git a/docker/tensorrt/trt.hcl b/docker/tensorrt/trt.hcl
index 730f54053..ba3b93244 100644
--- a/docker/tensorrt/trt.hcl
+++ b/docker/tensorrt/trt.hcl
@@ -14,12 +14,17 @@ variable "COMPUTE_LEVEL" {
   default = ""
 }
 variable "BASE_HOOK" {
-  # Ensure an up-to-date python 3.11 is available in tensorrt/jetson image
+  # Ensure an up-to-date python 3.11 is available in jetson images
   default = <<EOT
 if grep -iq \"ubuntu\" /etc/os-release; then
-  apt-get update &&
-  apt-get install -y software-properties-common &&
-  add-apt-repository ppa:deadsnakes/ppa;
+  . /etc/os-release
+
+  # Add the deadsnakes PPA repository
+  echo "deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu $VERSION_CODENAME main" >> /etc/apt/sources.list.d/deadsnakes.list
+  echo "deb-src https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu $VERSION_CODENAME main" >> /etc/apt/sources.list.d/deadsnakes.list
+
+  # Add deadsnakes signing key
+  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776
 fi
 EOT
 }