From 5d89bf547e7db33c1abe351e0779b1c7f540edbc Mon Sep 17 00:00:00 2001
From: Stanislas Bruhiere <stanislas@bruhiere.fr>
Date: Mon, 1 Apr 2024 18:02:06 +0200
Subject: [PATCH] feat: add health-checks in dev

---
 .github/workflows/builds.yml |  1 -
 docker-compose-dev.yml       | 10 ++++++++++
 docker-compose.yml           |  5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 9a30141..a5bfe87 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -31,7 +31,6 @@ jobs:
           S3_ENDPOINT_URL: ${{ secrets.S3_ENDPOINT_URL }}
         run: |
           docker compose up -d --build --wait
-          sleep 20
           docker compose logs backend
           nc -vz localhost 8080
           curl http://localhost:8080/docs
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index fabea73..61f3347 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -23,6 +23,11 @@ services:
       - S3_ENDPOINT_URL=${S3_ENDPOINT_URL}
     depends_on:
       - db
+    healthcheck:
+      test: ['CMD-SHELL', 'nc -vz localhost 8080']
+      interval: 10s
+      timeout: 3s
+      retries: 3
   db:
     image: postgres:15-alpine
     volumes:
@@ -33,6 +38,11 @@ services:
       - POSTGRES_USER=dummy_pg_user
       - POSTGRES_PASSWORD=dummy_pg_pwd
       - POSTGRES_DB=dummy_pg_db
+    healthcheck:
+      test: ['CMD-SHELL', "sh -c 'pg_isready -U dummy_pg_user -d dummy_pg_db'"]
+      interval: 10s
+      timeout: 3s
+      retries: 3
   proxy:
     build: nginx
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index 91d8768..ea6f831 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,11 @@ services:
       - S3_SECRET_KEY=${S3_SECRET_KEY}
       - S3_REGION=${S3_REGION}
       - S3_ENDPOINT_URL=${S3_ENDPOINT_URL}
+    healthcheck:
+      test: ['CMD-SHELL', 'nc -vz localhost 8080']
+      interval: 10s
+      timeout: 3s
+      retries: 3
     depends_on:
       db:
         condition: service_healthy