From 9e4298bb73f21ac0f06cd582fbb3c05a2875b3b9 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Thu, 15 Dec 2022 15:00:02 +0100 Subject: [PATCH 1/6] HSP-3864 SORMAS 1.77.4 with DEMIS 1.22.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 fc1fe777..e50077f2 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.38.4-rc1 -SORMAS_VERSION=1.77.3 +SORMAS_DOCKER_VERSION=2.38.4-rc2 +SORMAS_VERSION=1.77.4 SORMAS_DEMIS_VERSION=1.22.1 diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 83732f12..4b786139 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.77.3 +ARG SORMAS_VERSION=1.77.4 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.77.3 +ARG SORMAS_VERSION=1.77.4 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index e853429a..0d19681a 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -2,7 +2,7 @@ FROM jboss/keycloak:16.1.1 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ -ARG SORMAS_VERSION=1.77.3 +ARG SORMAS_VERSION=1.77.4 ARG SORMAS_SERVER_URL=sormas-docker-test.com diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile index da4c906a..010c8681 100644 --- a/letsencrypt/Dockerfile +++ b/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.77.3 +ARG SORMAS_VERSION=1.77.4 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 841a484f..518b98ea 100644 --- a/sormas/Dockerfile +++ b/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.77.3 +ARG SORMAS_VERSION=1.77.4 ENV SORMAS_VERSION=$SORMAS_VERSION From 7345ed633ece0f0320370b1c6b73e038bc8a41b2 Mon Sep 17 00:00:00 2001 From: Frank Hautpmann Date: Thu, 15 Dec 2022 18:39:23 +0100 Subject: [PATCH 2/6] Update .env --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index e50077f2..377600e1 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.38.4-rc2 -SORMAS_VERSION=1.77.4 +SORMAS_DOCKER_VERSION=2.38.5-rc1 +SORMAS_VERSION=1.77.5 SORMAS_DEMIS_VERSION=1.22.1 From 77f6b5e3370704a48e59b565fe234f1b52599549 Mon Sep 17 00:00:00 2001 From: Frank Hautpmann Date: Thu, 15 Dec 2022 18:39:52 +0100 Subject: [PATCH 3/6] Update Dockerfile --- apache2/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 4b786139..7076695b 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.77.4 +ARG SORMAS_VERSION=1.77.5 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.77.4 +ARG SORMAS_VERSION=1.77.5 ENV SORMAS_VERSION=$SORMAS_VERSION From 5a0e02dec3f40ee436e92a0aea9b190873443e4f Mon Sep 17 00:00:00 2001 From: Frank Hautpmann Date: Thu, 15 Dec 2022 18:40:07 +0100 Subject: [PATCH 4/6] Update Dockerfile --- keycloak/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 0d19681a..cd842067 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -2,7 +2,7 @@ FROM jboss/keycloak:16.1.1 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ -ARG SORMAS_VERSION=1.77.4 +ARG SORMAS_VERSION=1.77.5 ARG SORMAS_SERVER_URL=sormas-docker-test.com From 2137bad98384f0216db350e33adaeeb724e7d447 Mon Sep 17 00:00:00 2001 From: Frank Hautpmann Date: Thu, 15 Dec 2022 18:40:21 +0100 Subject: [PATCH 5/6] Update Dockerfile --- letsencrypt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile index 010c8681..922cee36 100644 --- a/letsencrypt/Dockerfile +++ b/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.77.4 +ARG SORMAS_VERSION=1.77.5 ENV SORMAS_VERSION=$SORMAS_VERSION From f19cb7b7ef33f99cd10a7c484de691bed2f718eb Mon Sep 17 00:00:00 2001 From: Frank Hautpmann Date: Thu, 15 Dec 2022 18:40:40 +0100 Subject: [PATCH 6/6] Update Dockerfile --- sormas/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 518b98ea..932fa0fa 100644 --- a/sormas/Dockerfile +++ b/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.77.4 +ARG SORMAS_VERSION=1.77.5 ENV SORMAS_VERSION=$SORMAS_VERSION