Merge pull request #500 from hzi-braunschweig/HSP-4602-sormas-1-81-fr…

…eigabe-und-bitte-um-roll-out

Hsp 4602 sormas 1 81 freigabe und bitte um roll out

.env

@@ -1,9 +1,9 @@
 SORMAS_POSTGRES_PASSWORD=password
 SORMAS_POSTGRES_USER=sormas_user
 
-SORMAS_DOCKER_VERSION=2.41.1
-SORMAS_VERSION=1.80.0
-SORMAS_DEMIS_VERSION=1.25.0
+SORMAS_DOCKER_VERSION=2.42.0
+SORMAS_VERSION=1.81.0
+SORMAS_DEMIS_VERSION=1.26.0
 
 SORMAS_SERVER_URL=sormas-docker-test.com
 SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/

apache2/Dockerfile

@@ -1,7 +1,7 @@
 FROM httpd:2.4-alpine as build
 ARG SORMAS_SERVER_URL
 
-ARG SORMAS_VERSION=1.80.0
+ARG SORMAS_VERSION=1.81.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.80.0
+ARG SORMAS_VERSION=1.81.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION

keycloak/Dockerfile

@@ -4,7 +4,7 @@ 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.80.0
+ARG SORMAS_VERSION=1.81.0
 
 RUN cd /tmp && \
     wget ${SORMAS_URL}v${SORMAS_VERSION}/sormas_${SORMAS_VERSION}.zip -O sormas.zip && \

letsencrypt/Dockerfile

@@ -5,7 +5,7 @@ FROM lsiobase/nginx:3.11
 ARG CERTBOT_VERSION=1.3.0
 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
 
-ARG SORMAS_VERSION=1.80.0
+ARG SORMAS_VERSION=1.81.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION

postgres/Dockerfile

@@ -4,12 +4,12 @@ RUN apk update --no-cache && \
     apk upgrade --no-cache && \
 # this line below keeping fixed musl lib version is unnecessary under docker 20.10.3+ but musl-dev has to be normally included in apk add, then
     apk add --no-cache --repository  http://dl-cdn.alpinelinux.org/alpine/v3.13/main/ 'musl<1.2.2-r3' 'musl-dev<1.2.2-r3' && \
-    apk add --no-cache openssl curl tzdata py-pip python3-dev postgresql-dev postgresql-contrib make gcc py3-psutil  && \
-    pip install pgxnclient && \
-    pgxnclient install temporal_tables
+    apk add --no-cache openssl curl tzdata py-pip python3-dev postgresql-dev postgresql-contrib make gcc py3-psutil 
 
+
 COPY psql.conf /etc/postgresql/postgresql.conf
 COPY alter_system.py /usr/local/bin/
 COPY tuning_parameters.conf /etc/postgresql/
 COPY setup_sormas.sh /docker-entrypoint-initdb.d/
+COPY update_sormas.sh /docker-entrypoint-updatedb.d/
 COPY docker-entrypoint.sh /usr/local/bin/

postgres/docker-entrypoint.sh

@@ -310,7 +310,14 @@ _main() {
 			echo
 			echo 'PostgreSQL Database directory appears to contain a database; Skipping initialization'
 			echo
-
+			docker_verify_minimum_env
+			export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}"
+			echo 'Starting temporary data base instance'
+			docker_temp_server_start "$@"
+            echo 'applying updates'
+			docker_process_init_files /docker-entrypoint-updatedb.d/*
+			echo 'Stoppinging temporary data base instance'
+			docker_temp_server_stop
 		fi
 	fi
 

postgres/setup_sormas.sh

@@ -11,7 +11,6 @@ psql -v ON_ERROR_STOP=1 --username "postgres" <<EOSQL
     \c ${DB_NAME}
     CREATE OR REPLACE PROCEDURAL LANGUAGE plpgsql;
     ALTER PROCEDURAL LANGUAGE plpgsql OWNER TO ${SORMAS_POSTGRES_USER};
-    CREATE EXTENSION temporal_tables;
     CREATE EXTENSION pg_trgm;
     CREATE EXTENSION pgcrypto;
     CREATE EXTENSION pg_stat_statements;

postgres/update_sormas.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+# Set up the database
+echo "Starting database modification..."
+
+psql -v ON_ERROR_STOP=1 --username "postgres" <<EOSQL
+    \c ${DB_NAME}
+    ALTER FUNCTION public.versioning() OWNER TO ${SORMAS_POSTGRES_USER};
+EOSQL

sormas/Dockerfile

@@ -14,7 +14,7 @@ ARG JVM_MAX=4096m
 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
 EXPOSE 6080
 
-ARG SORMAS_VERSION=1.80.0
+ARG SORMAS_VERSION=1.81.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION

sormas/setup-server.sh

@@ -133,8 +133,6 @@ echo "Copying apps..."
 mkdir -p ${DOMAIN_DIR}/deployments
 cp ${DEPLOY_PATH}/deploy/apps/*.ear ${DOMAIN_DIR}/deployments/
 cp ${DEPLOY_PATH}/deploy/apps/*.war ${DOMAIN_DIR}/deployments/
-cp ${DEPLOY_PATH}/deploy/s2s-generate-cert.sh /opt/sormas/sormas2sormas
-cp ${DEPLOY_PATH}/deploy/s2s-import-to-truststore.sh /opt/sormas/sormas2sormas
 
 #Der String "300" tritt ausschließlich an Stellen auf an denen die (txn-)Timeouts definiert werden. Diese werden auf "0" gesetzt um die Timeouts zu deaktivieren
 echo "Configure payara timeouts ..."