From 9a28b813ff7dd4e5d70c7ab667aa1e3bb4e52c92 Mon Sep 17 00:00:00 2001
From: utarwyn <maxime.malgorn@laposte.net>
Date: Sun, 26 May 2024 18:44:03 +0200
Subject: [PATCH] Update Docker Compose configuration file to V2

---
 CHANGELOG.md       |  4 ++++
 docker-compose.yml | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08fde95..a407930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   Add support for SonarQube up to 10.5
 
+### Changed
+
+-   Update Docker Compose configuration file to V2
+
 ## [1.5.0] - 2024-03-13
 
 ### Added
diff --git a/docker-compose.yml b/docker-compose.yml
index c2beef2..9b6c0b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,22 @@
-version: "3.3"
+---
+name: sonarqube_ecocode_javascript
+
 services:
   sonar:
     image: sonarqube:10-community
-    container_name: sonar_ecocode
+    container_name: sonar_ecocode_javascript
     ports:
       - "9000:9000"
     networks:
       - sonarnet
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     environment:
       SONAR_JDBC_USERNAME: sonar
       SONAR_JDBC_PASSWORD: sonar
       SONAR_JDBC_URL: jdbc:postgresql://db:5432/sonarqube
-      SONAR_ES_BOOTSTRAP_CHECKS_DISABLE: 'true'
+      SONAR_ES_BOOTSTRAP_CHECKS_DISABLE: "true"
     volumes:
       - type: bind
         source: ./sonar-plugin/target/ecocode-javascript-plugin-1.5.1-SNAPSHOT.jar
@@ -24,7 +27,7 @@ services:
 
   db:
     image: postgres:12
-    container_name: postgresql_ecocode
+    container_name: postgresql_ecocode_javascript
     networks:
       - sonarnet
     volumes:
@@ -34,6 +37,11 @@ services:
       POSTGRES_PASSWORD: sonar
       POSTGRES_DB: sonarqube
       PGDATA: pg_data:/var/lib/postgresql/data/pgdata
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U sonar -d sonarqube" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
 networks:
   sonarnet: