From 2695ffe52ec9544abbe07711970baa81899b0da3 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Fri, 8 Sep 2023 11:05:32 +0200 Subject: [PATCH 1/3] HSP-6226 SORMAS Hotfix 1.87.1 --- .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 58af21fb..fbdc5a7c 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.48.0-rc3 -SORMAS_VERSION=1.87.0 +SORMAS_DOCKER_VERSION=2.48.1-rc1 +SORMAS_VERSION=1.87.1 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.33.0 diff --git a/apache2/Dockerfile b/apache2/Dockerfile index b03161f9..7a9e88e2 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.87.0 +ARG SORMAS_VERSION=1.87.1 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.87.0 +ARG SORMAS_VERSION=1.87.1 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 9b3070e8..9f544337 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.87.0 +ARG SORMAS_VERSION=1.87.1 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 5b8af29e..435e60ab 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.87.0 +ARG SORMAS_VERSION=1.87.1 ENV SORMAS_VERSION=$SORMAS_VERSION LABEL maintainer="aptalca" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index a869e4ac..0eae9d02 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.87.0 +ARG SORMAS_VERSION=1.87.1 ENV SORMAS_VERSION=$SORMAS_VERSION From 9b4712b14be73a2aa2742ad7ae05a59514d5f7ed Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Fri, 8 Sep 2023 11:08:51 +0200 Subject: [PATCH 2/3] HSP-6226 with DEMIS 1.33.1 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index fbdc5a7c..ed70c743 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ SORMAS_POSTGRES_USER=sormas_user SORMAS_DOCKER_VERSION=2.48.1-rc1 SORMAS_VERSION=1.87.1 # only needed for CI build systems -SORMAS_DEMIS_VERSION=1.33.0 +SORMAS_DEMIS_VERSION=1.33.1 SORMAS_SERVER_URL=sormas-docker-test.com SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ From 2514b07006d479420e77a116ca7e425660cdbc3c Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Mon, 11 Sep 2023 12:45:43 +0200 Subject: [PATCH 3/3] HSP-6226 merge to master --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index ed70c743..00e460b3 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.48.1-rc1 +SORMAS_DOCKER_VERSION=2.48.1 SORMAS_VERSION=1.87.1 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.33.1