From e9a9673d658bf0b2fe652693247cf23e3fd29121 Mon Sep 17 00:00:00 2001
From: 3115fcfc-2c0b-4076-927f-ae6531c76061
 <212776804+3115fcfc-2c0b-4076-927f-ae6531c76061@users.noreply.github.com>
Date: Fri, 23 May 2025 23:20:17 +0000
Subject: [PATCH] Change PostgreSQL to Version 17 and OpenProject to Version 16

---
 .env.example                             | 10 +++++-----
 control/Dockerfile                       |  2 +-
 control/README.md                        |  2 +-
 control/upgrade/scripts/00-db-upgrade.sh |  2 +-
 docker-compose.yml                       |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env.example b/.env.example
index d84511e8..ad80280d 100644
--- a/.env.example
+++ b/.env.example
@@ -1,12 +1,12 @@
-##
-# All environment variables defined here will only apply if you pass them
-# to the OpenProject container in docker-compose.yml under x-op-app -> environment.
+#
+# All environment variables defined here will only apply if you pass them to
+# the OpenProject container in docker-compose.yml under x-op-app -> environment.
 # For the examples here this is already the case.
 #
 # Please refer to our documentation to see all possible variables:
 #   https://www.openproject.org/docs/installation-and-operations/configuration/environment/
 #
-TAG=15-slim
+TAG=16-slim
 OPENPROJECT_HTTPS=false
 OPENPROJECT_HOST__NAME=localhost
 PORT=127.0.0.1:8080
@@ -16,4 +16,4 @@ DATABASE_URL=postgres://postgres:p4ssw0rd@db/openproject?pool=20&encoding=unicod
 RAILS_MIN_THREADS=4
 RAILS_MAX_THREADS=16
 PGDATA="/var/lib/postgresql/data"
-OPDATA="/var/openproject/assets"
+OPDATA="/var/openproject/assets"
\ No newline at end of file
diff --git a/control/Dockerfile b/control/Dockerfile
index a90a259d..fe896c45 100644
--- a/control/Dockerfile
+++ b/control/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:12
 RUN apt-get update -qq && apt-get install wget gnupg2 -y && rm -rf /var/lib/apt/lists/*
 RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-RUN apt-get update -qq && apt-get install postgresql-9.6 postgresql-10 postgresql-13 -y && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -qq && apt-get install postgresql-17 -y && rm -rf /var/lib/apt/lists/*
 RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
 ENV LANG en_US.utf8
diff --git a/control/README.md b/control/README.md
index 329bdd54..4a3ff6c7 100644
--- a/control/README.md
+++ b/control/README.md
@@ -26,7 +26,7 @@ Switch off your current installation (using the outdated postgres engine):
 ```
 Fetch the latest changes from this repository:
 ```shell
-    git pull origin stable/15 # adjust if needed
+    git pull origin stable/16 # adjust if needed
 ```
 Build the control plane:
 ```shell
diff --git a/control/upgrade/scripts/00-db-upgrade.sh b/control/upgrade/scripts/00-db-upgrade.sh
index 1e89bade..62911874 100755
--- a/control/upgrade/scripts/00-db-upgrade.sh
+++ b/control/upgrade/scripts/00-db-upgrade.sh
@@ -3,7 +3,7 @@ set -e
 set -o pipefail
 
 CURRENT_PGVERSION="$(cat $PGDATA/PG_VERSION)"
-NEW_PGVERSION="13"
+NEW_PGVERSION="17"
 PGWORKDIR=${PGWORKDIR:=/var/lib/postgresql/work}
 
 if [ ! "$CURRENT_PGVERSION" -lt "$NEW_PGVERSION" ]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index b59cf4f8..2f5cc66d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,14 +22,14 @@ x-op-app: &app
     DATABASE_URL: "${DATABASE_URL:-postgres://postgres:p4ssw0rd@db/openproject?pool=20&encoding=unicode&reconnect=true}"
     RAILS_MIN_THREADS: ${RAILS_MIN_THREADS:-4}
     RAILS_MAX_THREADS: ${RAILS_MAX_THREADS:-16}
-    # set to true to enable the email receiving feature. See ./docker/cron for more options
+    # Set to true to enable the email receiving feature. See ./docker/cron for more options
     IMAP_ENABLED: "${IMAP_ENABLED:-false}"
   volumes:
     - "${OPDATA:-opdata}:/var/openproject/assets"
 
 services:
   db:
-    image: postgres:13
+    image: postgres:17
     <<: *restart_policy
     stop_grace_period: "3s"
     volumes: