Merge branch 'docker-multiple-services' into angular-ecommerce-drivers

omursahin · web-flow · commit 0430421fa7a0 · 2025-07-24T12:38:19.000+02:00
diff --git a/dockerfiles/bibliothek.yaml b/dockerfiles/bibliothek.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:6
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/blogapi.yaml b/dockerfiles/blogapi.yaml
@@ -13,9 +13,12 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
+    
       db:
-        condition: service_healthy
+          condition: service_healthy
+    
     
+
   db:
     image: mysql:8.0
     tmpfs:
@@ -35,9 +38,10 @@ services:
 
 
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
       retries: 3
 
 
+
diff --git a/dockerfiles/familie-ba-sak.yaml b/dockerfiles/familie-ba-sak.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: postgres:13.13
     tmpfs:
@@ -27,6 +28,7 @@ services:
 
 
 
+
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
     environment:
diff --git a/dockerfiles/genome-nexus.yaml b/dockerfiles/genome-nexus.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:3.6.2
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/gestaohospital.yaml b/dockerfiles/gestaohospital.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:6
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/ocvn.yaml b/dockerfiles/ocvn.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:3.2
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/pay-publicapi.yaml b/dockerfiles/pay-publicapi.yaml
@@ -12,10 +12,12 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: redis:7.2.3
     
 
 
 
 
+
diff --git a/dockerfiles/person-controller.yaml b/dockerfiles/person-controller.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:7.0
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/reservations-api.yaml b/dockerfiles/reservations-api.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: bitnami/mongodb:4.4
     tmpfs:
@@ -31,3 +32,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/session-service.yaml b/dockerfiles/session-service.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: mongo:6.0
     tmpfs:
@@ -21,3 +22,4 @@ services:
 
 
 
+
diff --git a/dockerfiles/spring-rest-example.yaml b/dockerfiles/spring-rest-example.yaml
@@ -13,9 +13,12 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
+    
       db:
-        condition: service_healthy
+          condition: service_healthy
+    
     
+
   db:
     image: mysql:8.0
     tmpfs:
@@ -30,9 +33,10 @@ services:
 
 
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
       retries: 3
 
 
+
diff --git a/dockerfiles/tiltaksgjennomforing.yaml b/dockerfiles/tiltaksgjennomforing.yaml
@@ -12,6 +12,7 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
+
   db:
     image: postgres:13.13
     tmpfs:
@@ -27,6 +28,7 @@ services:
 
 
 
+
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
     environment:
diff --git a/dockerfiles/user-management.yaml b/dockerfiles/user-management.yaml
@@ -13,9 +13,12 @@ services:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
     depends_on:
+    
       db:
-        condition: service_healthy
+          condition: service_healthy
+    
     
+
   db:
     image: mysql:8.0
     tmpfs:
@@ -30,9 +33,10 @@ services:
 
 
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 30s
       timeout: 30s
       retries: 3
 
 
+
diff --git a/scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json b/scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json
diff --git a/scripts/dockerize/data/sut.csv b/scripts/dockerize/data/sut.csv
diff --git a/scripts/dockerize/docker_generator.py b/scripts/dockerize/docker_generator.py
@@ -1,3 +1,4 @@
+import json
 import os
 import sys
 
@@ -54,16 +55,9 @@ def __init__(self, sut_name, expose_port):
         self.swagger_url = str(sut[1]['SWAGGER_URL']) if str(sut[1]['SWAGGER_URL']) != 'nan' else ''
         self.target_url = str(sut[1]['TARGET_URL']) if str(sut[1]['TARGET_URL']) != 'nan' else ''
         self.copy_additional_files = bool(sut[1]['COPY_ADDITIONAL_FILES'])
-        self.database_types = str(sut_info[1]['DATABASE']).split(';') if str(sut_info[1]['DATABASE']) != 'nan' else None
-        self.database_image = str(sut[1]['DATABASE_IMAGE_NAME']) if str(sut[1]['DATABASE_IMAGE_NAME']) != 'nan' else ''
-        self.database_port = int(sut[1]['DATABASE_PORT']) if str(sut[1]['DATABASE_PORT']) != 'nan' else ''
-        self.tmp_fs = str(sut[1]['TMP_FS']) if str(sut[1]['TMP_FS']) != 'nan' else ''
-        self.database_environments = str(sut[1]['DATABASE_ENVIRONMENT']).split(';') if str(sut[1]['DATABASE_ENVIRONMENT']) != 'nan' else None
-        self.database_volumes = str(sut[1]['DATABASE_VOLUME']).split(';') if str(sut[1]['DATABASE_VOLUME']) != 'nan' else None
         self.is_mock_oauth = bool(sut[1]['MOCK_OAUTH'])
-        self.health_check = bool(sut[1]['HEALTH_CHECK'])
-        self.health_check_commands = str(sut[1]['HEALTH_CHECK_COMMAND']).split(';') if str(sut[1]['HEALTH_CHECK_COMMAND']) != 'nan' else ''
-
+        self.database_config = json.loads(sut[1]['SERVICES']) if str(sut[1]['SERVICES']) != 'nan' else []
+        self.depends_on = str(sut[1]['DEPENDS_ON']).split(';') if str(sut[1]['DEPENDS_ON']) != 'nan' else []
     # def prepare_run_docker(self):
     #     # prepare the required files
     #     shutil.copy(self.jacoco_env_file_path, self.DOCKER_FILE_FOLDER)
@@ -131,27 +125,27 @@ def generate_docker_compose(self):
             'SUT_NAME': self.sut_name,
             'EXPOSE_PORT': self.expose_port,
             'MOCK_OAUTH': self.is_mock_oauth,
-            'HEALTH_CHECK': self.health_check,
+            'DEPENDS_ON': self.depends_on
         }
 
-        if self.database_types and any(db in ['PostgreSQL', 'MySQL', 'Redis', 'MongoDB'] for db in self.database_types):
-            database_template = self.template_env.get_template("db.template")
-            if self.health_check:
-                health_chec_command = ",".join(self.health_check_commands)
-            else:
-                health_chec_command = ""
+        database_template = self.template_env.get_template("db.template")
+        db_images = []
+        for db in self.database_config:
+            health_check_command = db['health_check_command']
+
             database_params = {
-                'DATABASE_IMAGE_NAME': self.database_image,
-                'DATABASE_PORT': self.database_port,
-                'TMP_FS': self.tmp_fs,
-                'DATABASE_ENVIRONMENT': self.database_environments,
-                'DATABASE_VOLUME': self.database_volumes,
-                'HEALTH_CHECK': self.health_check,
-                'HEALTH_CHECK_COMMAND': health_chec_command
+                'name': db['name'] if 'name' in db else 'db',
+                'DATABASE_IMAGE_NAME': db['image_name'],
+                'DATABASE_PORT': db['port'],
+                'TMP_FS': db['tmp_fs'],
+                'DATABASE_ENVIRONMENT': str(db['environment']).split(';') if str(db['environment']) != '' else None,
+                'DATABASE_VOLUME': str(db['volume']).split(';') if str(db['volume']) != '' else None,
+                'HEALTH_CHECK': health_check_command != "",
+                'HEALTH_CHECK_COMMAND': health_check_command
             }
             database_image = database_template.render(database_params)
-            params['MONGODB_DATABASE'] = database_image
-
+            db_images.append(database_image)
+        params['DATABASES'] = db_images
 
         template = self.template_env.get_template("template.docker-compose.yml")
         result = template.render(params)
diff --git a/scripts/dockerize/templates/db.template b/scripts/dockerize/templates/db.template
@@ -1,4 +1,4 @@
-  db:
+  {{name}}:
     image: {{DATABASE_IMAGE_NAME}}
     {% if TMP_FS -%}
     tmpfs:
@@ -18,7 +18,7 @@
 {% endif %}
 {% if HEALTH_CHECK %}
     healthcheck:
-      test: [{{HEALTH_CHECK_COMMAND}}]
+      test: {{HEALTH_CHECK_COMMAND}}
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/scripts/dockerize/templates/template.docker-compose.yml b/scripts/dockerize/templates/template.docker-compose.yml
@@ -12,12 +12,16 @@ services:
 #    volumes:
       # default env does not work on volumes
 #      - ${JACOCODIR}:/jacoco
-    {%- if HEALTH_CHECK %}
+    {%- if DEPENDS_ON | length > 0 %}
     depends_on:
-      db:
-        condition: service_healthy
+    {% for depends in DEPENDS_ON %}
+      {{depends}}:
+          condition: service_healthy
+    {% endfor %}
     {% endif %}
-{{ MONGODB_DATABASE if MONGODB_DATABASE }}
+{% for db_block in DATABASES %}
+{{ db_block }}
+{% endfor %}
 {%- if MOCK_OAUTH %}
   mock-oauth2-server:
     image: ghcr.io/navikt/mock-oauth2-server:2.0.1
