From 9064734ed2402d68b87ae5a1c145c87bf7d32727 Mon Sep 17 00:00:00 2001
From: Waleed Mortaja <27075022+WaleedMortaja@users.noreply.github.com>
Date: Fri, 6 Feb 2026 07:00:43 +0100
Subject: [PATCH 1/2] Make use of parameterized postgres password

---
 .env.example | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 6fb15d0..d1b3da9 100644
--- a/.env.example
+++ b/.env.example
@@ -17,7 +17,8 @@ OPENPROJECT_HOST__NAME=localhost
 PORT=127.0.0.1:8080
 OPENPROJECT_RAILS__RELATIVE__URL__ROOT=
 IMAP_ENABLED=false
-DATABASE_URL=postgres://postgres:p4ssw0rd@db/openproject?pool=20&encoding=unicode&reconnect=true
+POSTGRES_PASSWORD=p4ssw0rd
+DATABASE_URL="postgres://postgres:${POSTGRES_PASSWORD}@db/openproject?pool=20&encoding=unicode&reconnect=true"
 RAILS_MIN_THREADS=4
 RAILS_MAX_THREADS=16
 PGDATA="/var/lib/postgresql/data"

From 602961dcd2a6e918acbf5357c46bdaa3d28e2f51 Mon Sep 17 00:00:00 2001
From: Waleed Mortaja <27075022+WaleedMortaja@users.noreply.github.com>
Date: Fri, 6 Feb 2026 07:27:06 +0100
Subject: [PATCH 2/2] Parameterize postgres db and user

---
 .env.example       | 4 +++-
 docker-compose.yml | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index d1b3da9..e6cd430 100644
--- a/.env.example
+++ b/.env.example
@@ -17,8 +17,10 @@ OPENPROJECT_HOST__NAME=localhost
 PORT=127.0.0.1:8080
 OPENPROJECT_RAILS__RELATIVE__URL__ROOT=
 IMAP_ENABLED=false
+POSTGRES_DB=openproject
+POSTGRES_USER=postgres
 POSTGRES_PASSWORD=p4ssw0rd
-DATABASE_URL="postgres://postgres:${POSTGRES_PASSWORD}@db/openproject?pool=20&encoding=unicode&reconnect=true"
+DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}?pool=20&encoding=unicode&reconnect=true"
 RAILS_MIN_THREADS=4
 RAILS_MAX_THREADS=16
 PGDATA="/var/lib/postgresql/data"
diff --git a/docker-compose.yml b/docker-compose.yml
index 5422e5d..5ac6e70 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,8 +38,9 @@ services:
     volumes:
       - "${PGDATA:-pgdata}:/var/lib/postgresql/data"
     environment:
+      POSTGRES_DB: ${POSTGRES_DB:-openproject}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-p4ssw0rd}
-      POSTGRES_DB: openproject
     networks:
       - backend