From 62527ad02b513215c72acd6c8b2f392063e9e94d Mon Sep 17 00:00:00 2001
From: astrotuna201 <2393042+astrotuna201@users.noreply.github.com>
Date: Fri, 4 Oct 2024 16:39:26 +0200
Subject: [PATCH 1/2] Update Dockerfile

---
 17/bookworm/Dockerfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/17/bookworm/Dockerfile b/17/bookworm/Dockerfile
index 21a1f4958d..6bb9b7483b 100644
--- a/17/bookworm/Dockerfile
+++ b/17/bookworm/Dockerfile
@@ -28,7 +28,7 @@ RUN set -ex; \
 
 # grab gosu for easy step-down from root
 # https://github.com/tianon/gosu/releases
-ENV GOSU_VERSION 1.17
+ENV GOSU_VERSION 1.17.1
 RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
@@ -36,12 +36,13 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*; \
 	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
 	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
-	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
-	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-	gpgconf --kill all; \
-	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+	wget -O /usr/local/bin/gosu "https://github.com/acceldata-io/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+	#wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
+	#export GNUPGHOME="$(mktemp -d)"; \
+	#gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	#gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	#gpgconf --kill all; \
+	#rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \

From d633f8d339b01f3e6af712c3abd2c3fba5ba56e2 Mon Sep 17 00:00:00 2001
From: astrotuna201 <2393042+astrotuna201@users.noreply.github.com>
Date: Fri, 4 Oct 2024 16:39:47 +0200
Subject: [PATCH 2/2] Update Dockerfile

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

diff --git a/17/bookworm/Dockerfile b/17/bookworm/Dockerfile
index 6bb9b7483b..66c52105d8 100644
--- a/17/bookworm/Dockerfile
+++ b/17/bookworm/Dockerfile
@@ -35,7 +35,7 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends ca-certificates wget; \
 	rm -rf /var/lib/apt/lists/*; \
 	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
-	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+	#wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
 	wget -O /usr/local/bin/gosu "https://github.com/acceldata-io/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
 	#wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
 	#export GNUPGHOME="$(mktemp -d)"; \