From 488bdfe3e2457ee82e790c9060da22d2f36aa8ea Mon Sep 17 00:00:00 2001
From: Andros Fenollosa <andros@fenollosa.email>
Date: Sun, 1 Sep 2024 21:36:14 +0200
Subject: [PATCH] update

---
 compose.yaml     | 16 +++++++++++++---
 core/settings.py | 12 ++++++++----
 env.example      |  4 +++-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 6ec9329..b7ed84e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -6,9 +6,14 @@ services:
     restart: ${RESTART_POLICY}
     env_file: .env
     environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
+      interval: 30s
+      timeout: 60s
+      retries: 5
     expose:
       - 5432
 
@@ -46,6 +51,11 @@ services:
     restart: ${RESTART_POLICY}
     container_name: ${PROJECT_NAME}-redis
     env_file: .env
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 30s
+      timeout: 60s
+      retries: 5
     expose:
       - ${REDIS_PORT}
 
diff --git a/core/settings.py b/core/settings.py
index 766cd3e..ca4eb55 100644
--- a/core/settings.py
+++ b/core/settings.py
@@ -10,7 +10,6 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
 import os
-import dj_database_url
 from pathlib import Path
 from django.db.backends.signals import connection_created
 
@@ -75,9 +74,14 @@ TEMPLATES = [
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
 DATABASES = {
-    "default": dj_database_url.config(
-        default=f"postgres://{os.environ.get('DB_USER')}:{os.environ.get('DB_PASSWORD')}@{os.environ.get('DB_HOST')}:{os.environ.get('DB_PORT')}/{os.environ.get('DB_NAME')}"
-    )
+    "default": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.environ.get("POSTGRES_NAME"),
+        "USER": os.environ.get("POSTGRES_USER"),
+        "PASSWORD": os.environ.get("POSTGRES_PASSWORD"),
+        "HOST": os.environ.get("POSTGRES_HOST"),
+        "PORT": os.environ.get("POSTGRES_PORT"),
+    }
 }
 
 # Password validation
diff --git a/env.example b/env.example
index ff3fa8c..5287f2b 100644
--- a/env.example
+++ b/env.example
@@ -17,9 +17,11 @@ HCAPTCHA_ENABLED=False
 HCAPTCHA_SECRET_KEY=0x0000000000000000000000000000000000000000
 
 # Database
-POSTGRES_DB=project_db
+POSTGRES_HOST=postgresql
+POSTGRES_NAME=project_db
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
+POSTGRES_PORT=5432
 
 # Redis
 REDIS_URI="redis://:@redis:6379"