From 0955513857dc7801f38d3b2e323723b5392a2f78 Mon Sep 17 00:00:00 2001
From: Gematik <software-development@gematik.de>
Date: Wed, 4 Oct 2023 12:48:10 +0200
Subject: [PATCH] Updated Composefile

---
 demis.yml | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/demis.yml b/demis.yml
index 144967a..26d41c2 100644
--- a/demis.yml
+++ b/demis.yml
@@ -62,20 +62,20 @@ services:
 
   # DEMIS Configuration Files - The image is terminated immediately, it serves as data container
   demis-config-data:
-    image: gematik1/demis-configuration-test:1.8.1
+    image: gematik1/demis-configuration-test:1.9.1
     container_name: demis-config-data
     restart: "no"
     <<: *volume-setup-ref
 
   # DEMIS FHIR Profiles Data - The image is terminated immediately, it serves as data container
   demis-profile-data:
-    image: gematik1/demis-fhir-profile-snapshots:2.1.0
+    image: gematik1/demis-fhir-profile-snapshots:2.2.0
     container_name: demis-profile-data
     restart: "no"
     <<: *volume-profiles-ref
 
   keycloak:
-    image: gematik1/demis-keycloak:4.1.1-nginx
+    image: gematik1/demis-keycloak:4.2.0-nginx
     <<: *volume-setup-ref
     ports:
       - "9081:8080"
@@ -200,23 +200,8 @@ services:
     networks:
       demis-network:
 
-  pdf-generation-service:
-    image: gematik1/demis-pdf-generation:1.11.0
-    <<: [*service-setup-ref,*volume-setup-ref]
-    ports:
-      - "9074:8080"
-    container_name: demis-pdf-generation-service
-    restart: 'no'
-    networks:
-      demis-network:
-    depends_on:
-      demis-config-data:
-        condition: service_completed_successfully
-    environment:
-      <<: [*environment-config-ref, *environment-timezone-ref]
-
   notification-clearing-api:
-    image: gematik1/demis-notification-clearing-api:1.16.2
+    image: gematik1/demis-notification-clearing-api:1.16.4
     <<: *volume-setup-ref
     ports:
       - "9070:8080"
@@ -252,7 +237,7 @@ services:
       demis-network:
 
   notification-entry-service:
-    image: gematik1/demis-notification-entry-service:2.0.1
+    image: gematik1/demis-notification-entry-service:2.1.1
     ports:
       - "9080:8080"
     container_name: demis-notification-entry-service
@@ -260,6 +245,8 @@ services:
       <<: *environment-timezone-ref
       HAPI_SERVER_ADDRESS : "https://localhost:7443/notification-entry-service/fhir/"
       HAPI_CORS_ALLOW_ORIGIN: "*"
+      # Certificates 
+      HAPI_CERTIFICATES_PATH: /app/config/notification-entry-service/certs
       # Profiles Configuration
       HAPI_SCHEMAS_LOCATION_DV2: "/app/data/profiles/Fhir"
       HAPI_SCHEMAS_DISEASE_MAPPING: "/app/data/profiles/CodeMapping/ProfileResources/ConceptMap/NotificationDiseaseCategoryToSurvNetCode.xml"
@@ -278,17 +265,12 @@ services:
       # Notification Clearing Api
       HAPI_NCS_ENDPOINT: "http://demis-notification-clearing-api:8080/notification-clearing-api/fhir/"
       HAPI_NCS_APIKEY: aad3f9f00390689324a7f49c4e908fcf981dfa0563b857196e7ececf5f1eb0ea
-      # PDF Generation Service
-      HAPI_PGS_ENDPOINT: "http://demis-pdf-generation-service:8080/pdfgenerator/v1/generate"
-      HAPI_PGS_APIKEY: b052fc7ecd919c16a343ba743aa66bdaa720fdb8de45642cffb1b3981bb2fc54
       # PDFGen Service
       HAPI_PDF_GEN_SERVICE: "http://demis-pdfgen-service:8080"
       HAPI_APP_FLAG_USE_PDFGEN_SRV: "true"
     depends_on:
       pseudonymization-service:
         condition: service_started
-      pdf-generation-service:
-        condition: service_started
       storage-service:
         condition: service_started
       demis-config-data:
@@ -303,7 +285,7 @@ services:
       - demis-profiles-volume:/app/data/profiles:ro
 
   validation-service:
-    image: gematik1/demis-validation-service:2.0.0
+    image: gematik1/demis-validation-service:2.0.3
     <<: *volume-profiles-ref
     ports:
       - "8092:8080"
@@ -323,7 +305,7 @@ services:
       demis-network:
 
   hospital-location-service:
-    image: gematik1/demis-hospital-location-service:1.0.14
+    image: gematik1/demis-hospital-location-service:1.0.15
     <<: *service-setup-ref
     ports:
       - "8091:8080"
@@ -339,7 +321,7 @@ services:
       demis-network:
 
   report-processing-service:
-    image: gematik1/demis-report-processing-service:1.3.5
+    image: gematik1/demis-report-processing-service:1.3.6
     ports:
       - "8090:8090"
     container_name: demis-report-processing-service
@@ -364,7 +346,7 @@ services:
       demis-network:
 
   pdfgen-service:
-    image: gematik1/demis-pdfgen-service:2.1.1
+    image: gematik1/demis-pdfgen-service:2.1.3
     ports:
       - "8093:8080"
     container_name: demis-pdfgen-service
@@ -380,7 +362,7 @@ services:
       demis-network:
 
   fhir-ui-data-model-translation-service:
-    image: gematik1/demis-fhir-ui-data-model-translation-service:1.1.1
+    image: gematik1/demis-fhir-ui-data-model-translation-service:1.1.3
     <<: *volume-profiles-ref
     ports:
       - "8094:8080"