Merge pull request #20 from medizininformatik-initiative/operation/19…

…-upgrade-to-dsf-0-7-0 Upgrade to DSF 0.7.0
medizininformatik-initiative · Jul 27, 2022 · bdd394d · bdd394d
2 parents 71150f4 + d57d754
commit bdd394d
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 24 deletions.
diff --git a/feasibility-dsf-process-docker-test-setup/dic-1/bpe/cache/.gitkeep b/feasibility-dsf-process-docker-test-setup/dic-1/bpe/cache/.gitkeep
diff --git a/feasibility-dsf-process-docker-test-setup/dic-2/bpe/cache/.gitkeep b/feasibility-dsf-process-docker-test-setup/dic-2/bpe/cache/.gitkeep
diff --git a/feasibility-dsf-process-docker-test-setup/dic-3/bpe/cache/.gitkeep b/feasibility-dsf-process-docker-test-setup/dic-3/bpe/cache/.gitkeep
diff --git a/feasibility-dsf-process-docker-test-setup/docker-compose.yml b/feasibility-dsf-process-docker-test-setup/docker-compose.yml
@@ -73,8 +73,13 @@ services:
 
   # ---- ZARS - FHIR Inbox ----------------------------------------------------
   zars-fhir-app:
-    image: ghcr.io/highmed/fhir:0.5.5
+    image: ghcr.io/highmed/fhir:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_fhir.jar", "org.highmed.dsf.fhir.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
     - db_liquibase.password
     - db_fhir_zars_user.password
@@ -119,8 +124,13 @@ services:
 
   # ---- ZARS - BPE -----------------------------------------------------------
   zars-bpe-app:
-    image: ghcr.io/highmed/bpe:0.5.5
+    image: ghcr.io/highmed/bpe:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_bpe.jar", "org.highmed.dsf.bpe.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
     - db_liquibase.password
     - db_zars_bpe_user.password
@@ -144,6 +154,9 @@ services:
     - type: bind
       source: ./zars/bpe/last_event
       target: /opt/bpe/last_event
+    - type: bind
+      source: ./zars/bpe/cache
+      target: /opt/bpe/cache
     environment:
       TZ: Europe/Berlin
       ORG_HIGHMED_DSF_BPE_DB_LIQUIBASE_PASSWORD_FILE: /run/secrets/db_liquibase.password
@@ -170,8 +183,13 @@ services:
 
   # ---- DIC-1 - FHIR ---------------------------------------------------------
   dic-1-fhir-app:
-    image: ghcr.io/highmed/fhir:0.5.5
+    image: ghcr.io/highmed/fhir:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_fhir.jar", "org.highmed.dsf.fhir.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
     - db_liquibase.password
     - db_fhir_dic_1_user.password
@@ -216,8 +234,13 @@ services:
 
   # ---- DIC-1 - BPE ----------------------------------------------------------
   dic-1-bpe-app:
-    image: ghcr.io/highmed/bpe:0.5.5
+    image: ghcr.io/highmed/bpe:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_bpe.jar", "org.highmed.dsf.bpe.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
     - db_liquibase.password
     - db_dic_1_bpe_user.password
@@ -241,6 +264,9 @@ services:
     - type: bind
       source: ./dic-1/bpe/last_event
       target: /opt/bpe/last_event
+    - type: bind
+      source: ./dic-1/bpe/cache
+      target: /opt/bpe/cache
     environment:
       TZ: Europe/Berlin
       ORG_HIGHMED_DSF_BPE_DB_LIQUIBASE_PASSWORD_FILE: /run/secrets/db_liquibase.password
@@ -319,8 +345,13 @@ services:
 
   # ---- DIC-2 - FHIR ---------------------------------------------------------
   dic-2-fhir-app:
-    image: ghcr.io/highmed/fhir:0.5.5
+    image: ghcr.io/highmed/fhir:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_fhir.jar", "org.highmed.dsf.fhir.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
     - db_liquibase.password
     - db_fhir_dic_2_user.password
@@ -365,8 +396,13 @@ services:
 
   # ---- DIC-2 - BPE ----------------------------------------------------------
   dic-2-bpe-app:
-    image: ghcr.io/highmed/bpe:0.5.5
+    image: ghcr.io/highmed/bpe:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_bpe.jar", "org.highmed.dsf.bpe.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
     - db_liquibase.password
     - db_dic_2_bpe_user.password
@@ -390,6 +426,9 @@ services:
     - type: bind
       source: ./dic-2/bpe/last_event
       target: /opt/bpe/last_event
+    - type: bind
+      source: ./dic-2/bpe/cache
+      target: /opt/bpe/cache
     environment:
       TZ: Europe/Berlin
       ORG_HIGHMED_DSF_BPE_DB_LIQUIBASE_PASSWORD_FILE: /run/secrets/db_liquibase.password
@@ -438,8 +477,13 @@ services:
 
   # ---- DIC-3 - FHIR ---------------------------------------------------------
   dic-3-fhir-app:
-    image: ghcr.io/highmed/fhir:0.5.5
+    image: ghcr.io/highmed/fhir:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_fhir.jar", "org.highmed.dsf.fhir.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
       - db_liquibase.password
       - db_fhir_dic_3_user.password
@@ -484,8 +528,13 @@ services:
 
   # ---- DIC-3 - BPE ----------------------------------------------------------
   dic-3-bpe-app:
-    image: ghcr.io/highmed/bpe:0.5.5
+    image: ghcr.io/highmed/bpe:0.7.0
     restart: on-failure
+    healthcheck:
+      test: [ "CMD", "java", "-cp", "dsf_bpe.jar", "org.highmed.dsf.bpe.StatusClient" ]
+      interval: 10s
+      timeout: 15s
+      retries: 5
     secrets:
       - db_liquibase.password
       - db_dic_3_bpe_user.password
@@ -510,6 +559,9 @@ services:
       - type: bind
         source: ./dic-3/bpe/last_event
         target: /opt/bpe/last_event
+      - type: bind
+        source: ./dic-3/bpe/cache
+        target: /opt/bpe/cache
     environment:
       TZ: Europe/Berlin
       ORG_HIGHMED_DSF_BPE_DB_LIQUIBASE_PASSWORD_FILE: /run/secrets/db_liquibase.password

diff --git a/feasibility-dsf-process-docker-test-setup/zars/bpe/cache/.gitkeep b/feasibility-dsf-process-docker-test-setup/zars/bpe/cache/.gitkeep
diff --git a/feasibility-dsf-process-tools/pom.xml b/feasibility-dsf-process-tools/pom.xml
@@ -30,12 +30,12 @@
             <dependency>
                 <groupId>org.highmed.dsf</groupId>
                 <artifactId>dsf-fhir-rest-adapter</artifactId>
-                <version>0.5.5</version>
+                <version>0.7.0</version>
             </dependency>
             <dependency>
                 <groupId>org.highmed.dsf</groupId>
                 <artifactId>dsf-fhir-server</artifactId>
-                <version>0.5.5</version>
+                <version>0.7.0</version>
             </dependency>
 
         </dependencies>

diff --git a/feasibility-dsf-process/README.md b/feasibility-dsf-process/README.md
@@ -130,12 +130,12 @@ Besides the [common DSF settings controlled by different environment variables][
 
 This version of the process is compatible with the following components:
 
-| Component | Compatible Version(s) |
-|-----------|-----------------------|
-| DSF FHIR  | `0.5.x`               |
-| DSF BPE   | `0.5.x`               |
-| Blaze     | `>= 0.12`             |
-| Flare     | `1.0`                 |
+| Component | Compatible Version(s)     |
+|-----------|---------------------------|
+| DSF FHIR  | `0.5.x`, `0.6.0`, `0.7.0` |
+| DSF BPE   | `0.5.x`, `0.6.0`, `0.7.0` |
+| Blaze     | `>= 0.12`                 |
+| Flare     | `1.0`                     |
 
 **Note:** Flare got rewritten. Only the [new project][9] is supported.
 

diff --git a/feasibility-dsf-process/pom.xml b/feasibility-dsf-process/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.highmed.dsf</groupId>
             <artifactId>dsf-bpe-process-base</artifactId>
-            <version>0.5.5</version>
+            <version>0.7.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -43,12 +43,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>com.squareup.okhttp3</groupId>-->
-        <!--            <artifactId>mockwebserver</artifactId>-->
-        <!--            <version>3.8.1</version>-->
-        <!--            <scope>test</scope>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
@@ -88,7 +82,7 @@
         <dependency>
             <groupId>org.highmed.dsf</groupId>
             <artifactId>dsf-fhir-validation</artifactId>
-            <version>0.5.5</version>
+            <version>0.7.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>