From d8fba651be9818f3d43b9eb674f18a41d79de6f9 Mon Sep 17 00:00:00 2001 From: Tomasz Wojtunik Date: Mon, 23 Oct 2023 17:28:04 +0200 Subject: [PATCH 1/7] SORMAS 1.90.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 a0127c07..60727233 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ 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-RC +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/ 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 4e1ae1c72e0bacad04001c0d8f43371dbfb6b4ef Mon Sep 17 00:00:00 2001 From: Tomasz Wojtunik Date: Mon, 23 Oct 2023 17:30:40 +0200 Subject: [PATCH 2/7] SORMAS_DOCKER_VERSION=2.51.0-rc1 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 60727233..154b9663 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.51.0-RC +SORMAS_DOCKER_VERSION=2.51.0-rc1 SORMAS_VERSION=1.90.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.36.0 From 7317b25ed6c9a85f8bd28a0785a5387c84f6e845 Mon Sep 17 00:00:00 2001 From: Jedrzej Parzuchowski Date: Mon, 13 Nov 2023 10:37:27 +0100 Subject: [PATCH 3/7] 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 41d8d2a83473485d2f00aa2a9a7dce0eb4b45e99 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Mon, 20 Nov 2023 08:10:42 +0100 Subject: [PATCH 4/7] 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 From 5ba5321eaacb6021f172621392b2e4016c51cabb Mon Sep 17 00:00:00 2001 From: Jedrzej Parzuchowski Date: Tue, 21 Nov 2023 14:17:22 +0100 Subject: [PATCH 5/7] Updated Alpine and postgresql-client versions --- pg_dump/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pg_dump/Dockerfile b/pg_dump/Dockerfile index e59efe9b..ed1ab827 100644 --- a/pg_dump/Dockerfile +++ b/pg_dump/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:3.8 +FROM alpine:3.17 RUN apk update --no-cache && \ apk upgrade --no-cache && \ - apk add --no-cache --upgrade postgresql-client tar dcron tzdata zstd + apk add --no-cache --upgrade postgresql14-client tar dcron tzdata zstd COPY pg_dump /root COPY entrypoint.sh /entrypoint.sh From b1c06ceb185a4ff67debe0392fcc20c9dd7bf305 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Fri, 24 Nov 2023 11:00:24 +0100 Subject: [PATCH 6/7] updated Sormas-Docker version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 643aa20f..9124a47a 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.52.0-rc1 +SORMAS_DOCKER_VERSION=2.52.0-rc2 SORMAS_VERSION=1.91.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.37.0 From 2a9928fbf82e798ac40177ab95fd01ca2e766594 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Mon, 27 Nov 2023 09:05:38 +0100 Subject: [PATCH 7/7] HSP-6430 approval 1.91.1 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 9124a47a..29f74cec 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.52.0-rc2 +SORMAS_DOCKER_VERSION=2.52.0 SORMAS_VERSION=1.91.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.37.0