From d0f5387abf64f25d888069227fedb17a756b9ea7 Mon Sep 17 00:00:00 2001
From: msm-cert <156842376+msm-cert@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:07:01 +0000
Subject: [PATCH] Start docker container start order (#435)

Co-authored-by: msm <msm@cert.pl>
---
 docker-compose.dev.yml | 32 +++++++++++++++++++++++---------
 docker-compose.yml     |  7 +++++++
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a078ff9a..88b3fbd9 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -18,19 +18,23 @@ services:
       dockerfile: deploy/docker/dev.web.Dockerfile
     ports:
     - "5000:5000"
-    links:
-    - redis
-    - postgres
+    depends_on:
+      redis:
+        condition: service_started
+      postgres:
+        condition: service_healthy
     volumes:
     - "${SAMPLES_DIR}:/mnt/samples"
     - .:/usr/src/app
-    depends_on:
-      - "redis"
-      - "postgres"
     environment:
       - "REDIS_HOST=redis"
       - "MQUERY_BACKEND=tcp://ursadb:9281"
       - "DATABASE_URL=postgresql://postgres:password@postgres:5432/mquery"
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost:5000/api/server || exit 1"]
+      interval: 5s
+      timeout: 5s
+      retries: 30
   dev-daemon:
     build:
       context: .
@@ -43,9 +47,14 @@ services:
     - "${SAMPLES_DIR}:/mnt/samples"
     - .:/usr/src/app
     depends_on:
-      - "redis"
-      - "ursadb"
-      - "postgres"
+      dev-web:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      ursadb:
+        condition: service_started
+      postgres:
+        condition: service_healthy
     environment:
       - "REDIS_HOST=redis"
       - "MQUERY_BACKEND=tcp://ursadb:9281"
@@ -76,3 +85,8 @@ services:
     environment:
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=mquery
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
diff --git a/docker-compose.yml b/docker-compose.yml
index 722c9ca2..40ba3926 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,11 @@ services:
       - "REDIS_HOST=redis"
       - "MQUERY_BACKEND=tcp://ursadb:9281"
       - "DATABASE_URL=postgresql://postgres:password@postgres:5432/mquery"
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost:5000/api/server || exit 1"]
+      interval: 5s
+      timeout: 5s
+      retries: 30
   daemon:
     restart: always
     build:
@@ -30,6 +35,8 @@ services:
     volumes:
     - "${SAMPLES_DIR}:/mnt/samples"
     depends_on:
+      web:
+        condition: service_healthy
       redis:
         condition: service_started
       ursadb: