From f2386ed1da62e38163414449d51aa0d74015b611 Mon Sep 17 00:00:00 2001
From: Cory Hawkvelt <cory@hawkvelt.id.au>
Date: Sun, 5 Apr 2026 13:58:48 +0000
Subject: [PATCH] fix(docker): align database config between docker-compose and
 .env

- Move POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB to .env
- Update docker-compose.yml to reference env vars instead of hardcoding
- Fix db healthcheck to use correct credentials from .env
- Update .env.example with matching placeholder values
- Update DATABASE_URL to use variable interpolation
---
 .env.example       |  6 +++---
 docker-compose.yml | 16 ++++------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.env.example b/.env.example
index 4fd332d..7886ca6 100644
--- a/.env.example
+++ b/.env.example
@@ -7,9 +7,9 @@ FLASK_DEBUG=1
 # ═════════════════════════════════════════════════════════════════════════════
 COMPOSE_PROJECT_NAME=authy2
 FLASK_ENV=production
-POSTGRES_USER=authy2
-POSTGRES_PASSWORD=changeme-in-production
-POSTGRES_DB=authy2
+POSTGRES_USER=appuser
+POSTGRES_PASSWORD=change-me-in-production
+POSTGRES_DB=secuird
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
 SQLALCHEMY_DATABASE_URI=${DATABASE_URL}
 REDIS_URL=redis://redis:6379/0
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b2b9b5..5a0e2fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,14 +7,6 @@ services:
       dockerfile: Dockerfile
     env_file:
       - .env
-    environment:
-      - FLASK_ENV=production
-      - CORS_ORIGINS=http://192.168.50.124:8080,http://localhost:8080,http://localhost:5173
-      - DATABASE_URL=postgresql://${POSTGRES_USER:-gatehouse}:${POSTGRES_PASSWORD:-gatehouse}@db:5432/${POSTGRES_DB:-gatehouse}
-      - SQLALCHEMY_DATABASE_URI=postgresql://${POSTGRES_USER:-gatehouse}:${POSTGRES_PASSWORD:-gatehouse}@db:5432/${POSTGRES_DB:-gatehouse}
-      - REDIS_URL=redis://redis:6379/0
-      - SESSION_REDIS_URL=redis://redis:6379/0
-      - RATELIMIT_STORAGE_URL=redis://redis:6379/1
     ports:
       - "${API_PORT:-5000}:5000"
     depends_on:
@@ -35,16 +27,16 @@ services:
   db:
     image: postgres:16-alpine
     environment:
-      - POSTGRES_USER=${POSTGRES_USER:-gatehouse}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-gatehouse}
-      - POSTGRES_DB=${POSTGRES_DB:-gatehouse}
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
     volumes:
       - postgres_data:/var/lib/postgresql/data
     networks:
       - authy2-network
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-gatehouse} -d ${POSTGRES_DB:-gatehouse}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 10s
       timeout: 5s
       retries: 5