From 7317b25ed6c9a85f8bd28a0785a5387c84f6e845 Mon Sep 17 00:00:00 2001 From: Jedrzej Parzuchowski Date: Mon, 13 Nov 2023 10:37:27 +0100 Subject: [PATCH 1/4] Added default number of DB CPUs --- .env | 1 + 1 file changed, 1 insertion(+) diff --git a/.env b/.env index 89bd8666..bf89712c 100644 --- a/.env +++ b/.env @@ -60,6 +60,7 @@ KEYCLOAK_MEM=1024M KEYCLOAK_MEM_RESERVED=512M DB_MEM=5000M DB_MEM_RESERVED=1000M +DB_CPUS=4.0 # ALLOWED_FILE_EXTENSIONS=".pdf,.txt,.doc,.docx,.odt,.xls,.xlsx,.ods,.ppt,.pptx,.odp,.jpg,.jpeg,.png,.gif,.msg" HTTP_TIMEOUT=3600 From ed0cc0bfef6efc24ca7c01f98e8ee52dc6409103 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Tue, 14 Nov 2023 12:12:11 +0100 Subject: [PATCH 2/4] HSP-6382 new SORMAS release --- .env | 4 ++-- apache2/Dockerfile | 4 ++-- keycloak/Dockerfile | 2 +- letsencrypt/Dockerfile | 2 +- sormas/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index a0127c07..1cc41168 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.50.0 -SORMAS_VERSION=1.89.0 +SORMAS_DOCKER_VERSION=2.51.0 +SORMAS_VERSION=1.90.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.35.0 diff --git a/apache2/Dockerfile b/apache2/Dockerfile index d8cfee64..b5703fc7 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.89.0 +ARG SORMAS_VERSION=1.90.0 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3 ENV SORMAS_VERSION=$SORMAS_VERSION @@ -32,7 +32,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.89.0 +ARG SORMAS_VERSION=1.90.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 index 494070fa..159cf0a6 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -6,7 +6,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.89.0 +ARG SORMAS_VERSION=1.90.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 f21f927d..b9ead945 100644 --- a/letsencrypt/Dockerfile +++ b/letsencrypt/Dockerfile @@ -4,7 +4,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.89.0 +ARG SORMAS_VERSION=1.90.0 ENV SORMAS_VERSION=$SORMAS_VERSION LABEL maintainer="aptalca" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 4cdd4cfd..cfc0502a 100644 --- a/sormas/Dockerfile +++ b/sormas/Dockerfile @@ -13,7 +13,7 @@ ARG JVM_MAX=4096m ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ EXPOSE 6080 -ARG SORMAS_VERSION=1.89.0 +ARG SORMAS_VERSION=1.90.0 ENV SORMAS_VERSION=$SORMAS_VERSION ENV MAIL_FROM=root@localhost From 456f6490584d1d8f8c0354eebd64e168b41ead0c Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 15 Nov 2023 08:52:35 +0100 Subject: [PATCH 3/4] HSP-6382 fix DEMIS version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 1cc41168..acb46109 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ SORMAS_POSTGRES_USER=sormas_user SORMAS_DOCKER_VERSION=2.51.0 SORMAS_VERSION=1.90.0 # only needed for CI build systems -SORMAS_DEMIS_VERSION=1.35.0 +SORMAS_DEMIS_VERSION=1.36.0 SORMAS_SERVER_URL=sormas-docker-test.com SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ From 41d8d2a83473485d2f00aa2a9a7dce0eb4b45e99 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Mon, 20 Nov 2023 08:10:42 +0100 Subject: [PATCH 4/4] HSP-6381 new SORMAS version --- .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 5b0d099a..643aa20f 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.51.0 -SORMAS_VERSION=1.90.0 +SORMAS_DOCKER_VERSION=2.52.0-rc1 +SORMAS_VERSION=1.91.0 # only needed for CI build systems -SORMAS_DEMIS_VERSION=1.36.0 +SORMAS_DEMIS_VERSION=1.37.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 b5703fc7..ed510978 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.90.0 +ARG SORMAS_VERSION=1.91.0 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3 ENV SORMAS_VERSION=$SORMAS_VERSION @@ -32,7 +32,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.90.0 +ARG SORMAS_VERSION=1.91.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 index 159cf0a6..d3c689a5 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -6,7 +6,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.90.0 +ARG SORMAS_VERSION=1.91.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 b9ead945..506c0281 100644 --- a/letsencrypt/Dockerfile +++ b/letsencrypt/Dockerfile @@ -4,7 +4,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.90.0 +ARG SORMAS_VERSION=1.91.0 ENV SORMAS_VERSION=$SORMAS_VERSION LABEL maintainer="aptalca" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index cfc0502a..97f0ca06 100644 --- a/sormas/Dockerfile +++ b/sormas/Dockerfile @@ -13,7 +13,7 @@ ARG JVM_MAX=4096m ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ EXPOSE 6080 -ARG SORMAS_VERSION=1.90.0 +ARG SORMAS_VERSION=1.91.0 ENV SORMAS_VERSION=$SORMAS_VERSION ENV MAIL_FROM=root@localhost