From 797c986040d1b2f5c2068205233b1587c59c037b Mon Sep 17 00:00:00 2001
From: Paul Rabahy <PRabahy@gmail.com>
Date: Mon, 16 Dec 2024 21:36:34 -0500
Subject: [PATCH 1/3] Update TOR version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 93f9a6b..dae415f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG VERSION=0.4.7.13
+ARG VERSION=0.4.8.13
 
 ARG USER=toruser
 ARG UID=1000

From ce1824cd9fd43e64cc4d630b2509d627b29f32e0 Mon Sep 17 00:00:00 2001
From: Paul Rabahy <PRabahy@gmail.com>
Date: Mon, 16 Dec 2024 21:37:02 -0500
Subject: [PATCH 2/3] Update TOR signing keys

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dae415f..84db208 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,11 @@ RUN apt update
 RUN apt -y install gpg gpg-agent curl
 
 # Add tor key
-ENV KEYS 514102454D0A87DB0767A1EBBE6A0531C18A9179 B74417EDDF22AC9F9E90F49142E86A2A11F48D36 7A02B3521DC75C542BA015456AFEE6D49E92B601
+# Grabbed from https://gitlab.torproject.org/tpo/core/tor/-/blob/main/README.md#keys-that-can-sign-a-release
+ENV KEYS 514102454D0A87DB0767A1EBBE6A0531C18A9179 B74417EDDF22AC9F9E90F49142E86A2A11F48D36 2133BC600AB133E1D826D173FE43009C4607B1FB
 
 #RUN curl -s https://openpgpkey.torproject.org/.well-known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf |gpg --import -
-RUN gpg --keyserver keyserver.ubuntu.com --recv-keys $KEYS 
+RUN gpg --keyserver keys.openpgp.org --recv-keys $KEYS 
 
 RUN gpg --list-keys | tail -n +3 | tee /tmp/keys.txt && \
     gpg --list-keys $KEYS | diff - /tmp/keys.txt

From cf6ab6034791d6e6a0add1525b23b222ee9b099b Mon Sep 17 00:00:00 2001
From: Paul Rabahy <PRabahy@gmail.com>
Date: Mon, 16 Dec 2024 21:37:49 -0500
Subject: [PATCH 3/3] Update debian version

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 84db208..11bf41e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG UID=1000
 
 ARG DIR=/data
 
-FROM debian:11-slim as preparer-base
+FROM debian:12-slim as preparer-base
 
 RUN apt update
 RUN apt -y install gpg gpg-agent curl
@@ -36,7 +36,7 @@ RUN tar -xzf "/tor-$VERSION.tar.gz" && \
 
 FROM preparer-release AS preparer
 
-FROM debian:11-slim as builder
+FROM debian:12-slim as builder
 
 ARG VERSION
 
@@ -56,7 +56,7 @@ RUN ls -la /etc/tor
 RUN ls -la /var/lib
 RUN ls -la /var/lib/tor
 
-FROM debian:11-slim as final
+FROM debian:12-slim as final
 
 ARG VERSION
 ARG USER