From 36ba47410d274dfa8e9eed96c5ce5ea7e16ff43a Mon Sep 17 00:00:00 2001 From: Tobias Lehmann Date: Thu, 12 Sep 2024 13:30:55 +0200 Subject: [PATCH] fixed sonar config --- playbooks/captica-webserver.yml | 4 ++-- templates/sonarqube/docker-compose.yml.j2 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/captica-webserver.yml b/playbooks/captica-webserver.yml index 36e2301..54b6988 100644 --- a/playbooks/captica-webserver.yml +++ b/playbooks/captica-webserver.yml @@ -71,8 +71,8 @@ service_name: sonarqube service_directory: /opt/git/sonarqube service_volume_dirs: - - appdata - - config + - appdata + - db service_user_name: sonarqube service_user_id: 1045 service_group_name: sonarqube diff --git a/templates/sonarqube/docker-compose.yml.j2 b/templates/sonarqube/docker-compose.yml.j2 index 226d113..fcdc4ec 100644 --- a/templates/sonarqube/docker-compose.yml.j2 +++ b/templates/sonarqube/docker-compose.yml.j2 @@ -14,9 +14,9 @@ services: - SONAR_JDBC_PASSWORD=${DB_PASSWORD} restart: always volumes: - - {{ service_directory }}/data/app/appdata:/opt/sonarqube/data - - {{ service_directory }}/data/app/extensions:/opt/sonarqube/extensions - - {{ service_directory }}/data/app/logs:/opt/sonarqube/logs + - {{ service_directory }}/data/appdata/data:/opt/sonarqube/data + - {{ service_directory }}/data/appdata/extensions:/opt/sonarqube/extensions + - {{ service_directory }}/data/appdata/logs:/opt/sonarqube/logs - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -44,7 +44,7 @@ services: - USER_GID={{ service_group_id }} command: ["curl", "-L", "-O", "-u {{ service_user_id }}:{{ service_group_id }}","--output-dir", "/plugins", "https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar"] volumes: - - {{ service_directory }}/data/app/extensions/plugins:/plugins + - {{ service_directory }}/data/appdata/extensions/plugins:/plugins networks: default: