fix: use healthcheck for postgres instead of pinging

Author: amcsz

config/docker/docker-compose.yml

@@ -2,16 +2,21 @@ services:
   othello_postgres:
     container_name: othello_postgres
     image: postgres:latest
-    ports:
-    - "5432:5432"
     environment:
     - POSTGRES_DB=othello
     - POSTGRES_USER=othello
     - POSTGRES_PASSWORD=pwd
     volumes:
-    - "othello_pgdata:/var/lib/postgresql"
+    - othello_pgdata:/var/lib/postgresql
+    ports:
+    - "5432:5432"
     networks:
     - othello_network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U othello -d othello"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
   othello_redis:
     container_name: othello_redis
     image: redis:latest
@@ -28,8 +33,10 @@ services:
     ports:
     - "8000:8000"
     depends_on:
-    - othello_postgres
-    - othello_redis
+      othello_postgres:
+        condition: service_healthy
+      othello_redis:
+        condition: service_started
     volumes:
     - ../../:/app
     working_dir: /app
@@ -45,8 +52,10 @@ services:
     container_name: othello_celery
     image: othello_django
     depends_on:
-    - othello_postgres
-    - othello_redis
+      othello_postgres:
+        condition: service_healthy
+      othello_redis:
+        condition: service_started
     volumes:
     - ../../:/app
     working_dir: /app
@@ -62,8 +71,10 @@ services:
     container_name: othello_gamequeue
     image: othello_django
     depends_on:
-    - othello_postgres
-    - othello_redis
+      othello_postgres:
+        condition: service_healthy
+      othello_redis:
+        condition: service_started
     volumes:
     - ../../:/app
     working_dir: /app

config/docker/entrypoint.sh

@@ -3,12 +3,6 @@ set -e
 
 uv sync
 uv run manage.py collectstatic --noinput
-
-until (PGPASSWORD=pwd psql -h "othello_postgres" -U "othello" -c '\q') 2> /dev/null; do
-  >&2 echo "waiting for postgres"
-  sleep 1
-done
-
 uv run manage.py makemigrations --noinput
 uv run manage.py migrate
 uv run manage.py shell -c "

othello/settings/__init__.py

@@ -20,7 +20,7 @@
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
         "CONFIG": {
-            "hosts": [("localhost", 6379)],
+            "hosts": [("othello_redis", 6379)],
             "capacity": 1500,
             "expiry": 2,
         },