From 2a1a2a49e46b76a8d423d41f9e652bc258dba1fa Mon Sep 17 00:00:00 2001
From: Tomasz Wojtunik <tomasz.wojtunik@likims.com>
Date: Thu, 22 Jun 2023 16:26:01 +0200
Subject: [PATCH 1/4] Set new jndiName prefix for SORMAS >= 1.86.0

---
 sormas/start-server.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sormas/start-server.sh b/sormas/start-server.sh
index 54b4eb74..e70d390a 100644
--- a/sormas/start-server.sh
+++ b/sormas/start-server.sh
@@ -482,7 +482,12 @@ if [ ! -z "$DEMIS_ENABLED" ] ;then
   set +e
   cp -a /tmp/${DOMAIN_NAME}/config/demis/. ${DOMAIN_DIR}/config/
   set -e
-  if  [ "$(printf '%s\n' "1.73.0" "$SORMAS_VERSION" | sort -V | head -n1)" = "1.73.0" ]; then 
+  if  [ "$(printf '%s\n' "1.86.0" "$SORMAS_VERSION" | sort -V | head -n1)" = "1.86.0" ]; then 
+    # new Facade for SORMAS >= 1.86.0
+    if [ ! -z "$DEMIS_VERSION" ] && [ "$DEMIS_VERSION" != "" ];then
+      echo -e "\ninterface.externalMessageAdapter.jndiName=java:global/sormas-demis-adapter-${DEMIS_VERSION}/DemisMessageFacade" >>${DOMAIN_DIR}/sormas.properties
+    fi
+  elif  [ "$(printf '%s\n' "1.73.0" "$SORMAS_VERSION" | sort -V | head -n1)" = "1.73.0" ]; then 
     # new Facade for SORMAS >= 1.73.0
     if [ ! -z "$DEMIS_VERSION" ] && [ "$DEMIS_VERSION" != "" ];then
       echo -e "\ninterface.demis.jndiName=java:global/sormas-demis-adapter-${DEMIS_VERSION}/DemisMessageFacade" >>${DOMAIN_DIR}/sormas.properties

From 906bfc1ee822d665d5d197cdc7b2cfa0e4ce556c Mon Sep 17 00:00:00 2001
From: Frank Hauptmann <hauptmann@netzlink.com>
Date: Wed, 5 Jul 2023 14:03:06 +0200
Subject: [PATCH 2/4] HSP-5304 remove version checking for demis adapter

---
 sormas/start-server.sh | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/sormas/start-server.sh b/sormas/start-server.sh
index e70d390a..8e4fc0f3 100644
--- a/sormas/start-server.sh
+++ b/sormas/start-server.sh
@@ -482,24 +482,12 @@ if [ ! -z "$DEMIS_ENABLED" ] ;then
   set +e
   cp -a /tmp/${DOMAIN_NAME}/config/demis/. ${DOMAIN_DIR}/config/
   set -e
-  if  [ "$(printf '%s\n' "1.86.0" "$SORMAS_VERSION" | sort -V | head -n1)" = "1.86.0" ]; then 
-    # new Facade for SORMAS >= 1.86.0
-    if [ ! -z "$DEMIS_VERSION" ] && [ "$DEMIS_VERSION" != "" ];then
-      echo -e "\ninterface.externalMessageAdapter.jndiName=java:global/sormas-demis-adapter-${DEMIS_VERSION}/DemisMessageFacade" >>${DOMAIN_DIR}/sormas.properties
-    fi
-  elif  [ "$(printf '%s\n' "1.73.0" "$SORMAS_VERSION" | sort -V | head -n1)" = "1.73.0" ]; then 
-    # new Facade for SORMAS >= 1.73.0
-    if [ ! -z "$DEMIS_VERSION" ] && [ "$DEMIS_VERSION" != "" ];then
-      echo -e "\ninterface.demis.jndiName=java:global/sormas-demis-adapter-${DEMIS_VERSION}/DemisMessageFacade" >>${DOMAIN_DIR}/sormas.properties
-    fi
-  else 
-    # old Facade for SORMAS < 1.73.0
-    if [ ! -z "$DEMIS_VERSION" ] && [ "$DEMIS_VERSION" != "" ];then
-      echo -e "\ninterface.demis.jndiName=java:global/sormas-demis-adapter-${DEMIS_VERSION}/DemisExternalLabResultsFacade" >>${DOMAIN_DIR}/sormas.properties
-    fi
+  # new Facade for SORMAS >= 1.86.0
+  if [ ! -z "$DEMIS_VERSION" ] && [ "$DEMIS_VERSION" != "" ];then
+    echo -e "\ninterface.externalMessageAdapter.jndiName=java:global/sormas-demis-adapter-${DEMIS_VERSION}/DemisMessageFacade" >>${DOMAIN_DIR}/sormas.properties
   fi
   if [ ! -z "$DEBUGINFO_ENABLED" ] && [ "$DEBUGINFO_ENABLED" != "" ];then
-    echo -e "debuginfo.enabled=${DEBUGINFO_ENABLED}" >${DOMAIN_DIR}/config/demis-adapter.properties
+    echo -e "\ndebuginfo.enabled=${DEBUGINFO_ENABLED}" >${DOMAIN_DIR}/config/demis-adapter.properties
   fi
   if [ ! -z "$FHIR_BASEPATH" ] && [ "$FHIR_BASEPATH" != "" ];then
     echo -e "\nfhir.basepath=${FHIR_BASEPATH}" >>${DOMAIN_DIR}/config/demis-adapter.properties

From 55cac5a4d18d8d8ab1411f31201e30bec2a7143c Mon Sep 17 00:00:00 2001
From: Tomasz Wojtunik <tomasz.wojtunik@likims.com>
Date: Thu, 6 Jul 2023 17:28:27 +0200
Subject: [PATCH 3/4] Import all available certificates in to payara keystores

---
 sormas/start-server.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sormas/start-server.sh b/sormas/start-server.sh
index e70d390a..8522e1d3 100644
--- a/sormas/start-server.sh
+++ b/sormas/start-server.sh
@@ -591,9 +591,12 @@ done
 if [ ! -z "$AUTHENTICATION_PROVIDER" -a "$AUTHENTICATION_PROVDER" != "SORMAS" ];then
   echo "Updating payara keystores"
   set +e
-  keytool -storepass ${CACERTS_PASS} -importcert -trustcacerts -destkeystore ${DOMAIN_DIR}/config/cacerts.jks -file /tmp/certs/sormas-docker-test.com.crt -alias sormas-docker-test.com -noprompt
-  openssl pkcs12 -export -in /tmp/certs/sormas-docker-test.com.crt -inkey /tmp/certs/sormas-docker-test.com.key -out sormas-docker-test.com.p12 -name sormas-docker-test.com -password pass:${KEYSTORE_PASS}
-  keytool -storepass ${KEYSTORE_PASS} -importkeystore -destkeystore ${DOMAIN_DIR}/config/keystore.jks -srckeystore sormas-docker-test.com.p12 -srcstoretype PKCS12 -srcstorepass changeit -alias sormas-docker-test.com -noprompt
+  for file in $(ls /tmp/certs/*.crt); do
+      base_name=$(basename $file .crt)
+      keytool -storepass ${CACERTS_PASS} -importcert -trustcacerts -destkeystore ${DOMAIN_DIR}/config/cacerts.jks -file /tmp/certs/${base_name}.crt -alias ${base_name} -noprompt
+      openssl pkcs12 -export -in /tmp/certs/${base_name}.crt -inkey /tmp/certs/${base_name}.key -out ${base_name}.p12 -name ${base_name} -password pass:${KEYSTORE_PASS}
+      keytool -storepass ${KEYSTORE_PASS} -importkeystore -destkeystore ${DOMAIN_DIR}/config/keystore.jks -srckeystore ${base_name}.p12 -srcstoretype PKCS12 -srcstorepass changeit -alias ${base_name} -noprompt
+  done
   set -e
 fi
 

From 272432b43d014c70ef4b564c623d42ee0bdda31a Mon Sep 17 00:00:00 2001
From: Frank Hauptmann <hauptmann@netzlink.com>
Date: Wed, 19 Jul 2023 10:41:12 +0200
Subject: [PATCH 4/4] HSP-5333 SORMAS 1.86.0 with DEMIS 1.30.0

---
 .env                   | 6 +++---
 apache2/Dockerfile     | 4 ++--
 keycloak/Dockerfile    | 2 +-
 letsencrypt/Dockerfile | 2 +-
 sormas/Dockerfile      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index f6129bb2..5574dc98 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,9 @@
 SORMAS_POSTGRES_PASSWORD=password
 SORMAS_POSTGRES_USER=sormas_user
 
-SORMAS_DOCKER_VERSION=2.43.0-rc1
-SORMAS_VERSION=1.82.0
-SORMAS_DEMIS_VERSION=1.27.0
+SORMAS_DOCKER_VERSION=2.47.0-rc1
+SORMAS_VERSION=1.86.0
+SORMAS_DEMIS_VERSION=1.30.0
 
 SORMAS_SERVER_URL=sormas-docker-test.com
 SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
diff --git a/apache2/Dockerfile b/apache2/Dockerfile
index bb8a8943..6fd6e00f 100644
--- a/apache2/Dockerfile
+++ b/apache2/Dockerfile
@@ -1,7 +1,7 @@
 FROM httpd:2.4-alpine as build
 ARG SORMAS_SERVER_URL
 
-ARG SORMAS_VERSION=1.82.0
+ARG SORMAS_VERSION=1.86.0
 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
@@ -36,7 +36,7 @@ RUN cd /usr/src/apache2/mod_auth_openidc-${MOD_AUTH_OPENIDC_VERSION}/ && ls -la
 
 FROM httpd:2.4-alpine
 ARG SORMAS_SERVER_URL
-ARG SORMAS_VERSION=1.82.0
+ARG SORMAS_VERSION=1.86.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index b1268137..93395293 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -4,7 +4,7 @@ USER root
 RUN microdnf update && microdnf install -y wget unzip
 
 ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
-ARG SORMAS_VERSION=1.82.0
+ARG SORMAS_VERSION=1.86.0
 
 RUN cd /tmp && \
     wget ${SORMAS_URL}v${SORMAS_VERSION}/sormas_${SORMAS_VERSION}.zip -O sormas.zip && \
diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile
index a359190b..cf0d296e 100644
--- a/letsencrypt/Dockerfile
+++ b/letsencrypt/Dockerfile
@@ -5,7 +5,7 @@ FROM lsiobase/nginx:3.11
 ARG CERTBOT_VERSION=1.3.0
 ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 
-ARG SORMAS_VERSION=1.82.0
+ARG SORMAS_VERSION=1.86.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
diff --git a/sormas/Dockerfile b/sormas/Dockerfile
index 8f006b83..12fdbac6 100644
--- a/sormas/Dockerfile
+++ b/sormas/Dockerfile
@@ -14,7 +14,7 @@ ARG JVM_MAX=4096m
 ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 EXPOSE 6080
 
-ARG SORMAS_VERSION=1.82.0
+ARG SORMAS_VERSION=1.86.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION