From 1a4f8b441d590edc637f1a3629a4a360b8eee55b Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Tue, 2 Jan 2024 13:27:33 +0100 Subject: [PATCH 1/4] HSP-6479 merge new Version to integration --- .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 6a6c1049..72ed15f8 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.53.0-rc2 -SORMAS_VERSION=1.92.0 +SORMAS_DOCKER_VERSION=2.54.0-rc1 +SORMAS_VERSION=1.93.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.38.0 diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 1ebf4d58..f8147d60 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.92.0 +ARG SORMAS_VERSION=1.93.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.92.0 +ARG SORMAS_VERSION=1.93.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 c1c593c4..5690f5f5 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.92.0 +ARG SORMAS_VERSION=1.93.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 da9789ff..a108b4dc 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.92.0 +ARG SORMAS_VERSION=1.93.0 ENV SORMAS_VERSION=$SORMAS_VERSION LABEL maintainer="aptalca" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 18559f66..c7950443 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.92.0 +ARG SORMAS_VERSION=1.93.0 ENV SORMAS_VERSION=$SORMAS_VERSION ENV MAIL_FROM=root@localhost From f284046dbd2b73001d3c991bce13696058685b7c Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 3 Jan 2024 15:41:04 +0100 Subject: [PATCH 2/4] HSP-6490 DEMIS 1.39.0 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 72ed15f8..44d57e5e 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ SORMAS_POSTGRES_USER=sormas_user SORMAS_DOCKER_VERSION=2.54.0-rc1 SORMAS_VERSION=1.93.0 # only needed for CI build systems -SORMAS_DEMIS_VERSION=1.38.0 +SORMAS_DEMIS_VERSION=1.39.0 SORMAS_SERVER_URL=sormas-docker-test.com SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ From 8546ff631920855dfddeeed4e4da451cb5041b9a Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 3 Jan 2024 15:41:34 +0100 Subject: [PATCH 3/4] HSP-6490 RC2 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 44d57e5e..d17942de 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.54.0-rc1 +SORMAS_DOCKER_VERSION=2.54.0-rc2 SORMAS_VERSION=1.93.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.39.0 From c3d17cca9efb9475fed1f04184ff2c39f8686301 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Fri, 12 Jan 2024 14:45:20 +0100 Subject: [PATCH 4/4] HSP-6532 tag as stable --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index d17942de..e3718507 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.54.0-rc2 +SORMAS_DOCKER_VERSION=2.54.0 SORMAS_VERSION=1.93.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.39.0