From a11a1a3a62248e5a73b79e24b51db5d663756c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <o.guenther@openproject.com>
Date: Tue, 21 Nov 2023 14:33:42 +0100
Subject: [PATCH] Add pg_client postgres 15 (#14180)

* Add pg_client postgres 15

* Remove overridden PGBIN
---
 docker/prod/Dockerfile           | 7 +++++--
 docker/prod/setup/postinstall.sh | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index d6650901fea1..c54465e97ba8 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -71,6 +71,8 @@ ENV APP_USER=app
 ENV APP_PATH=/app
 ENV APP_DATA_PATH=/var/openproject/assets
 ENV PGVERSION="13"
+ENV CURRENT_PGVERSION="13"
+ENV NEXT_PGVERSION="15"
 ENV PGBIN="/usr/lib/postgresql/$PGVERSION/bin"
 ENV BUNDLE_WITHOUT="development:test"
 
@@ -101,11 +103,12 @@ RUN --mount=type=cache,target=/var/cache/apt \
   curl \
   gnupg2 \
   && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' $PGVERSION > /etc/apt/sources.list.d/pgdg.list \
+  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
   && apt-get update -qq \
   && apt-get install -yq --no-install-recommends \
   libpq5 \
-  postgresql-client-$PGVERSION \
+  postgresql-client-$CURRENT_PGVERSION \
+  postgresql-client-$NEXT_PGVERSION \
   libffi7 \
   unrtf tesseract-ocr poppler-utils catdoc imagemagick \
   && apt-get purge -y curl gnupg2 \
diff --git a/docker/prod/setup/postinstall.sh b/docker/prod/setup/postinstall.sh
index 416eb24c813e..f1d9c75fd281 100755
--- a/docker/prod/setup/postinstall.sh
+++ b/docker/prod/setup/postinstall.sh
@@ -3,8 +3,6 @@
 set -e
 set -o pipefail
 
-export PGBIN="$(pg_config --bindir)"
-
 display_error() {
 	echo " !--> ERROR on postinstall:"
 	tail -n 200 /tmp/dockerize.log