Merge pull request #537 from SORMAS-Foundation/HSP-5333-sormas-1-86-0

HSP 5333 sormas 1 86 0
SORMAS-Foundation · Jul 19, 2023 · 017a8a9 · 017a8a9
2 parents 4557fbc + 319e234
commit 017a8a9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 25 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,8 @@
 SORMAS_POSTGRES_PASSWORD=password
 SORMAS_POSTGRES_USER=sormas_user
 
-SORMAS_DOCKER_VERSION=2.46.0-rc1
-SORMAS_VERSION=1.85.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

diff --git 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.85.0
+ARG SORMAS_VERSION=1.86.0
 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
@@ -36,8 +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.85.0
-
+ARG SORMAS_VERSION=1.86.0
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
 ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/

diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
@@ -3,8 +3,8 @@ FROM redhat/ubi8-minimal:latest as config-source
 USER root
 RUN microdnf update && microdnf install -y wget unzip
 
-ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
-ARG SORMAS_VERSION=1.85.0
+ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
+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
@@ -5,8 +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.85.0
-
+ARG SORMAS_VERSION=1.86.0
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
 LABEL maintainer="aptalca"

diff --git a/sormas/Dockerfile b/sormas/Dockerfile
@@ -14,8 +14,7 @@ ARG JVM_MAX=4096m
 ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 EXPOSE 6080
 
-ARG SORMAS_VERSION=1.85.0
-
+ARG SORMAS_VERSION=1.86.0
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
 

diff --git a/sormas/start-server.sh b/sormas/start-server.sh
@@ -482,19 +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 
-    # 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
@@ -586,9 +579,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