Merge pull request #39 from green-code-initiative/technical_upgrade

technical upgrade on Docker system

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#23](https://github.com/green-code-initiative/creedengo-ios/pull/23) Docker update (updated SonarQube and sonar-apple versions)
 - [#37](https://github.com/green-code-initiative/creedengo-ios/issues/37) Renaming to Creedengo
+- [#39](https://github.com/green-code-initiative/creedengo-ios/pull/39) technical upgrade on docker system
 
 ### Deleted
 

Dockerfile

@@ -1,5 +1,19 @@
-FROM sonarqube:10.5.0-community
+ARG MAVEN_BUILDER=3-openjdk-17-slim
+ARG SONARQUBE_VERSION=24.12.0.100206-community
+
+FROM maven:${MAVEN_BUILDER} AS builder
+
+COPY . /usr/src/creedengo
+
+WORKDIR /usr/src/creedengo
+COPY sonar-ios-plugin/src src/
+COPY pom.xml tool_build.sh ./
+
+RUN ./tool_build.sh
+
+FROM sonarqube:${SONARQUBE_VERSION}
 USER root
 ADD https://github.com/insideapp-oss/sonar-apple/releases/download/0.5.0/sonar-apple-plugin-0.5.0.jar /opt/sonarqube/extensions/plugins/sonar-apple-plugin-0.5.0.jar
 RUN chmod 777 /opt/sonarqube/extensions/plugins/sonar-apple-plugin-0.5.0.jar
-USER sonarqube
+COPY --from=builder /usr/src/creedengo/sonar-ios-plugin/target/creedengo-*.jar /opt/sonarqube/extensions/plugins/
+USER sonarqube

docker-compose.yml

@@ -1,25 +1,28 @@
-version: "3.3"
+name: sonarqube_creedengo_ios
+
 services:
   sonar:
-    build:
-      dockerfile: Dockerfile
-      context: .
+    build: .
     container_name: sonar_creedengo_ios
     ports:
-      - "9000: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'
+    env_file:
+      - path: ./.default.docker.env
+        required: true
+      - path: ./.override.docker.env
+        required: false
     volumes:
-      - type: bind
-        source: ./sonar-ios-plugin/target/creedengo-sonar-ios-plugin-2.0.0-SNAPSHOT.jar
-        target: /opt/sonarqube/extensions/plugins/creedengo-sonar-ios-plugin-2.0.0-SNAPSHOT.jar
+      - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"
   db:
@@ -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: