From b307f5ea43f81282755284e82726311db8b50044 Mon Sep 17 00:00:00 2001
From: Zack Pollard <zackpollard@ymail.com>
Date: Mon, 11 Nov 2024 17:53:21 +0000
Subject: [PATCH] feat: postgresql clients for version 14/15/16/17

---
 server/Dockerfile           | 24 ++++++++++++++++--------
 server/bin/configure-apt.sh |  4 ++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index f3f7bf4..378c010 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -31,13 +31,17 @@ RUN ./configure-apt.sh && \
         pkg-config \
         wget \
         zlib1g \
-        cpanminus && \
+        cpanminus \
+        wget \
+        postgresql-client-14 \
+        postgresql-client-15 \
+        postgresql-client-16 \
+        postgresql-client-17 && \
     apt-get install -t testing --no-install-recommends -yqq \
         libdav1d-dev \
         libhwy-dev \
         libwebp-dev \
-        libio-compress-brotli-perl \
-        postgresql-client-17
+        libio-compress-brotli-perl
 
 COPY bin/* ./
 
@@ -62,10 +66,11 @@ WORKDIR /build
 
 COPY bin/build-lock.json bin/configure-apt.sh bin/install-ffmpeg.sh  ./
 
-RUN ./configure-apt.sh && \
+RUN apt-get update && \
+    apt-get install curl ca-certificates --no-install-recommends -yqq && \
+    ./configure-apt.sh && \
     apt-get update && \
     apt-get install --no-install-recommends -yqq \
-        ca-certificates \
         jq \
         libde265-0 \
         libexif12 \
@@ -88,15 +93,18 @@ RUN ./configure-apt.sh && \
         tini \
         wget \
         zlib1g \
-        ocl-icd-libopencl1 && \
+        ocl-icd-libopencl1 \
+        postgresql-client-14 \
+        postgresql-client-15 \
+        postgresql-client-16 \
+        postgresql-client-17 && \
     ./install-ffmpeg.sh && \
     apt-get install -t testing --no-install-recommends -yqq \
         libio-compress-brotli-perl \
         libwebp7 \
         libwebpdemux2 \
         libwebpmux3 \
-        libhwy1t64 \
-        postgresql-client-17 && \
+        libhwy1t64 && \
     if [ $(arch) = "x86_64" ]; then \
         wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17193.4/intel-igc-core_1.0.17193.4_amd64.deb && \
         wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17193.4/intel-igc-opencl_1.0.17193.4_amd64.deb && \
diff --git a/server/bin/configure-apt.sh b/server/bin/configure-apt.sh
index f8f15a7..5ffaad1 100755
--- a/server/bin/configure-apt.sh
+++ b/server/bin/configure-apt.sh
@@ -16,3 +16,7 @@ Pin: release a=testing
 Pin-Priority: 450
 EOL
 
+# Setup postgresql repository
+install -d /usr/share/postgresql-common/pgdg
+curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list