version upgrades and fixes back ported from develop

Author: hhund

codex-processes-ap1-docker-test-setup/docker-compose.yml

@@ -37,7 +37,7 @@ services:
     image: postgres:13
     restart: on-failure
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres -d postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -U liquibase_user -d postgres" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -66,7 +66,7 @@ services:
 
 
   dic-fhir:
-    image: ghcr.io/highmed/fhir:0.5.1
+    image: ghcr.io/highmed/fhir:0.6.0
     restart: on-failure
     ports:
       - 127.0.0.1:5000:5000
@@ -113,7 +113,7 @@ services:
       - db
       - proxy
   dic-bpe:
-    image: ghcr.io/highmed/bpe:0.5.1
+    image: ghcr.io/highmed/bpe:0.6.0
     restart: on-failure
     ports:
       - 127.0.0.1:5003:5003
@@ -194,7 +194,7 @@ services:
 
 
   gth-fhir:
-    image: ghcr.io/highmed/fhir:0.5.1
+    image: ghcr.io/highmed/fhir:0.6.0
     restart: on-failure
     ports:
       - 127.0.0.1:5001:5001
@@ -241,7 +241,7 @@ services:
       - db
       - proxy
   gth-bpe:
-    image: ghcr.io/highmed/bpe:0.5.1
+    image: ghcr.io/highmed/bpe:0.6.0
     restart: on-failure
     ports:
       - 127.0.0.1:5004:5004
@@ -298,7 +298,7 @@ services:
 
 
   crr-fhir:
-    image: ghcr.io/highmed/fhir:0.5.1
+    image: ghcr.io/highmed/fhir:0.6.0
     restart: on-failure
     ports:
       - 127.0.0.1:5002:5002
@@ -345,7 +345,7 @@ services:
       - db
       - proxy
   crr-bpe:
-    image: ghcr.io/highmed/bpe:0.5.1
+    image: ghcr.io/highmed/bpe:0.6.0
     restart: on-failure
     ports:
       - 127.0.0.1:5005:5005
@@ -404,7 +404,7 @@ services:
       - crr-fhir
     # - crr-fhir-bridge not defining a dependency here, crr-fhir-bridge* needs to be started manually
   crr-ehrbase-db:
-    image: ehrbase/ehrbase-postgres:latest
+    image: ehrbase/ehrbase-postgres
     networks:
       - crr-ehrbase-network
     environment:
@@ -414,7 +414,7 @@ services:
       EHRBASE_PASSWORD: ehrbase
       TZ: Europe/Berlin
   crr-ehrbase:
-    image: ehrbase/ehrbase:next
+    image: ehrbase/ehrbase
     networks:
       - crr-ehrbase-network
     environment:
@@ -428,22 +428,23 @@ services:
       SECURITY_AUTHADMINPASSWORD: mySuperAwesomePassword123
       SYSTEM_NAME: local.ehrbase.org
       ADMIN_API_ACTIVE: 'true'
+#      SERVER_DISABLESTRICTVALIDATION: 'true'
       TZ: Europe/Berlin
     depends_on:
       - crr-ehrbase-db
   crr-fhir-bridge:
-    image: ehrbase/fhir-bridge:1.2.1
+    image: ehrbase/fhir-bridge
     ports:
       - 127.0.0.1:8888:8888
       - 127.0.0.1:5006:5006
     networks:
       - crr-ehrbase-network
       - crr-bpe-backend
     environment:
-      FHIR_BRIDGE_EHRBASE_BASE_URL: http://crr-ehrbase:8080/ehrbase/rest/openehr/v1/
+      FHIR_BRIDGE_EHRBASE_BASE_URL: http://crr-ehrbase:8080/ehrbase/
       FHIR_BRIDGE_FHIR_VALIDATION_OPTIONAL_IDENTIFIER: 'true'
       TZ: Europe/Berlin
-#     SPRING_PROFILES_ACTIVE: dev
+#      SPRING_PROFILES_ACTIVE: dev
       JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006
     depends_on:
       - crr-ehrbase
@@ -459,7 +460,7 @@ secrets:
 
   db_liquibase.password:
     file: ./secrets/db_liquibase.password
-    
+
   db_dic_fhir_user.password:
     file: ./secrets/db_dic_fhir_user.password
   db_dic_fhir_user_permanent_delete.password:
@@ -519,7 +520,7 @@ networks:
     ipam:
       driver: default
       config:
-      - subnet: 172.20.0.64/28
+        - subnet: 172.20.0.64/28
   dic-fhir-backend:
   dic-bpe-frontend:
   dic-bpe-backend:
@@ -528,7 +529,7 @@ networks:
     ipam:
       driver: default
       config:
-      - subnet: 172.20.0.80/28
+        - subnet: 172.20.0.80/28
   gth-fhir-backend:
   gth-bpe-frontend:
   gth-bpe-backend:
@@ -537,7 +538,7 @@ networks:
     ipam:
       driver: default
       config:
-      - subnet: 172.20.0.96/28
+        - subnet: 172.20.0.96/28
   crr-fhir-backend:
   crr-bpe-frontend:
   crr-bpe-backend:
@@ -546,4 +547,4 @@ networks:
 
 volumes:
   db-data:
-    name: db-data
+    name: db-data-codex-dsf-processes