SONAR-22581 address reviewer comments

SonarSource · Jul 25, 2024 · 78a76a2 · 78a76a2
1 parent e79a7df
commit 78a76a2
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/example-compose-files/sq-dce-postgres/docker-compose.yml b/example-compose-files/sq-dce-postgres/docker-compose.yml
@@ -39,6 +39,7 @@ services:
       - sonarqube_extensions:/opt/sonarqube/extensions
       - sonarqube_logs:/opt/sonarqube/logs
       - sonarqube_temp:/opt/sonarqube/temp
+      - /opt/sonarqube/data
   search-1:
     image: sonarqube:datacenter-search
     read_only: true
@@ -58,9 +59,10 @@ services:
       SONAR_CLUSTER_ES_HOSTS: "search-1,search-2,search-3"
       SONAR_CLUSTER_NODE_NAME: "search-1"
     volumes:
-      - search-data-1:/opt/sonarqube/data
+      - search_data-1:/opt/sonarqube/data
       - sonarqube_logs:/opt/sonarqube/logs
-      - temp_search-1:/opt/sonarqube/temp
+      - search_temp-1:/opt/sonarqube/temp
+      - search_logs-1:/opt/sonarqube/logs
     healthcheck:
         test: wget --no-proxy -qO- "http://$$SONAR_CLUSTER_NODE_NAME:9001/_cluster/health?wait_for_status=yellow&timeout=50s" | grep -q -e '"status":"green"' -e '"status":"yellow"';  if [ $? -eq 0 ]; then exit 0; else exit 1; fi
         interval: 25s
@@ -86,9 +88,10 @@ services:
       SONAR_CLUSTER_ES_HOSTS: "search-1,search-2,search-3"
       SONAR_CLUSTER_NODE_NAME: "search-2"
     volumes:
-      - search-data-2:/opt/sonarqube/data
+      - search_data-2:/opt/sonarqube/data
       - sonarqube_logs:/opt/sonarqube/logs
-      - temp_search-2:/opt/sonarqube/temp
+      - search_temp-2:/opt/sonarqube/temp
+      - search_logs-2:/opt/sonarqube/logs
     healthcheck:
         test: wget --no-proxy -qO- "http://$$SONAR_CLUSTER_NODE_NAME:9001/_cluster/health?wait_for_status=yellow&timeout=50s" | grep -q -e '"status":"green"' -e '"status":"yellow"';  if [ $? -eq 0 ]; then exit 0; else exit 1; fi
         interval: 25s
@@ -114,9 +117,10 @@ services:
       SONAR_CLUSTER_ES_HOSTS: "search-1,search-2,search-3"
       SONAR_CLUSTER_NODE_NAME: "search-3"
     volumes:
-      - search-data-3:/opt/sonarqube/data
+      - search_data-3:/opt/sonarqube/data
       - sonarqube_logs:/opt/sonarqube/logs
-      - temp_search-3:/opt/sonarqube/temp
+      - search_temp-3:/opt/sonarqube/temp
+      - search_logs-3:/opt/sonarqube/logs
     healthcheck:
         test: wget --no-proxy -qO- "http://$$SONAR_CLUSTER_NODE_NAME:9001/_cluster/health?wait_for_status=yellow&timeout=50s" | grep -q -e '"status":"green"' -e '"status":"yellow"';  if [ $? -eq 0 ]; then exit 0; else exit 1; fi
         interval: 25s
@@ -161,12 +165,15 @@ networks:
 volumes:
   sonarqube_extensions:
   sonarqube_logs:
-  search-data-1:
-  search-data-2:
-  search-data-3:
+  search_logs-1:
+  search_logs-2:
+  search_logs-3:
+  search_data-1:
+  search_data-2:
+  search_data-3:
+  search_temp-1:
+  search_temp-2:
+  search_temp-3:
   sonarqube_temp:
-  temp_search-1:
-  temp_search-2:
-  temp_search-3:
   postgresql:
   postgresql_data: