From 2166f46a24bda66c83af20a9e51ea729d2615b2d Mon Sep 17 00:00:00 2001
From: freakynl <freaky@bananateam.nl>
Date: Tue, 10 Oct 2023 17:30:10 +0200
Subject: [PATCH] Update Dockerfile

Fixed version 14 code to be usable with proxy (is cleaner too)
---
 14.0/Dockerfile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/14.0/Dockerfile b/14.0/Dockerfile
index 42f1e4adc..aa27f5979 100644
--- a/14.0/Dockerfile
+++ b/14.0/Dockerfile
@@ -37,14 +37,8 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # install latest postgresql-client
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
-    && GNUPGHOME="$(mktemp -d)" \
-    && export GNUPGHOME \
-    && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
-    && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
-    && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
-    && gpgconf --kill all \
-    && rm -rf "$GNUPGHOME" \
+RUN echo 'deb [signed-by=/etc/apt/trusted.gpg.d/pgdg.gpg.asc] http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+    && curl -o /etc/apt/trusted.gpg.d/pgdg.gpg.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
     && apt-get update  \
     && apt-get install --no-install-recommends -y postgresql-client \
     && rm -f /etc/apt/sources.list.d/pgdg.list \