Fix the docker compose (#377)

Fix the docker compose
CERT-Polska · Feb 15, 2024 · 979368a · 979368a
1 parent b270e37
commit 979368a
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,14 +7,13 @@ services:
       dockerfile: deploy/docker/web.Dockerfile
     ports:
     - "80:5000"
-    links:
-    - redis
-    - postgres
+    depends_on:
+      redis:
+        condition: service_started
+      postgres:
+        condition: service_healthy
     volumes:
     - "${SAMPLES_DIR}:/mnt/samples"
-    depends_on:
-      - "redis"
-      - "postgres"
     environment:
       - "REDIS_HOST=redis"
       - "MQUERY_BACKEND=tcp://ursadb:9281"
@@ -31,9 +30,12 @@ services:
     volumes:
     - "${SAMPLES_DIR}:/mnt/samples"
     depends_on:
-      - "redis"
-      - "ursadb"
-      - "postgres"
+      redis:
+        condition: service_started
+      ursadb:
+        condition: service_started
+      postgres:
+        condition: service_healthy
     environment:
       - "REDIS_HOST=redis"
       - "MQUERY_BACKEND=tcp://ursadb:9281"
@@ -58,3 +60,8 @@ services:
     environment:
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=mquery
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5