Refactored wait_for_db command to be more robust

app/core/management/commands/wait_for_db.py

@@ -1,23 +1,22 @@
 import time
 
-from psycopg2 import OperationalError as Psycopg2Error
-
+from django.db import connections
 from django.db.utils import OperationalError
 from django.core.management.base import BaseCommand
 
-
 class Command(BaseCommand):
 
     def handle(self, *args, **options):
-        self.stdout.write('waiting for database...')
-        db_up = False
+        self.stdout.write('Waiting for database...')
+        db_conn = None
 
-        while db_up is False:
+        while not db_conn:
             try:
-                self.check(databases=['default'])
-                db_up = True
-            except (Psycopg2Error, OperationalError):
+                db_conn = connections['default']
+                db_conn.ensure_connection()
+            except OperationalError:
                 self.stdout.write('Database unavailable, waiting 1 second...')
                 time.sleep(1)
 
         self.stdout.write(self.style.SUCCESS('Database available!'))
+

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   app:
     build: