From 42ae2efe267db91afe97d11a861b43055fb9aadf Mon Sep 17 00:00:00 2001 From: sergiupacurariu Date: Wed, 29 Nov 2023 12:28:39 +0200 Subject: [PATCH 1/7] #12753 - Update postgreSQL from Version 14.9 to Version 14.10 --- postgres/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres/Dockerfile b/postgres/Dockerfile index 4116e4f7..bae3f1ce 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:14.9-alpine3.17 +FROM postgres:14.10-alpine3.17 RUN apk update --no-cache && \ apk upgrade --no-cache && \ From f1d6cbb4ea4d2af1aeb1841ca7c7ad73072cbf2c Mon Sep 17 00:00:00 2001 From: sergiupacurariu Date: Wed, 29 Nov 2023 12:32:55 +0200 Subject: [PATCH 2/7] #12753 - Update postgreSQL from Version 14.9 to Version 14.10 --- postgres/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres/Dockerfile b/postgres/Dockerfile index bae3f1ce..e025e51f 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:14.10-alpine3.17 +FROM postgres:14.10-alpine RUN apk update --no-cache && \ apk upgrade --no-cache && \ From 47e94c94f6cc24a14aa2124cd72e5748daa3287b Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 6 Dec 2023 10:59:13 +0100 Subject: [PATCH 3/7] HSP-6442 new SORMAS release candidate --- .env | 4 ++-- apache2/Dockerfile | 2 +- keycloak/Dockerfile | 2 +- letsencrypt/Dockerfile | 2 +- sormas/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 9124a47a..955e4689 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.52.0-rc2 -SORMAS_VERSION=1.91.0 +SORMAS_DOCKER_VERSION=2.53.0-rc1 +SORMAS_VERSION=1.92.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.37.0 diff --git a/apache2/Dockerfile b/apache2/Dockerfile index ed510978..02341bef 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.91.0 +ARG SORMAS_VERSION=1.92.0 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index d3c689a5..c1c593c4 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.91.0 +ARG SORMAS_VERSION=1.92.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 506c0281..da9789ff 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.91.0 +ARG SORMAS_VERSION=1.92.0 ENV SORMAS_VERSION=$SORMAS_VERSION LABEL maintainer="aptalca" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 97f0ca06..18559f66 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.91.0 +ARG SORMAS_VERSION=1.92.0 ENV SORMAS_VERSION=$SORMAS_VERSION ENV MAIL_FROM=root@localhost From 1843c15e1f32db317f93516a059b60dc71bebacf Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 6 Dec 2023 11:00:28 +0100 Subject: [PATCH 4/7] HSP-6442 second occurrence --- apache2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 02341bef..1ebf4d58 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -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.91.0 +ARG SORMAS_VERSION=1.92.0 ENV SORMAS_VERSION=$SORMAS_VERSION ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ From 2fc69aef6d7fadbb09f03adbb11b9fe43fe74b6d Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 6 Dec 2023 11:14:17 +0100 Subject: [PATCH 5/7] HSP-6442 remove downgrading musl --- postgres/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgres/Dockerfile b/postgres/Dockerfile index 34883f5e..dcac7e28 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -3,8 +3,8 @@ FROM postgres:10.18-alpine RUN apk update --no-cache && \ apk upgrade --no-cache && \ # this line below keeping fixed musl lib version is unnecessary under docker 20.10.3+ but musl-dev has to be normally included in apk add, then - apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/main/ 'musl<1.2.2-r3' 'musl-dev<1.2.2-r3' && \ - apk add --no-cache openssl curl tzdata py-pip python3-dev postgresql-dev postgresql-contrib make gcc py3-psutil +# apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/main/ 'musl<1.2.2-r3' 'musl-dev<1.2.2-r3' && \ + apk add --no-cache openssl curl tzdata py-pip python3-dev postgresql-dev postgresql-contrib make gcc py3-psutil musl-dev COPY psql.conf /etc/postgresql/postgresql.conf From c2179a9fc208afe59d830609d9299542a2cabcd3 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Thu, 7 Dec 2023 07:42:03 +0100 Subject: [PATCH 6/7] HSP-6442 DEMIS --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 955e4689..6a6c1049 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.53.0-rc1 +SORMAS_DOCKER_VERSION=2.53.0-rc2 SORMAS_VERSION=1.92.0 # only needed for CI build systems -SORMAS_DEMIS_VERSION=1.37.0 +SORMAS_DEMIS_VERSION=1.38.0 SORMAS_SERVER_URL=sormas-docker-test.com SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ From aa7713d108e2997dd9b8875520c57019d067ec39 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Tue, 12 Dec 2023 14:45:01 +0100 Subject: [PATCH 7/7] HSP-6458 new SORMAS release 1.92.0 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 6a6c1049..75eb4bf6 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.53.0-rc2 +SORMAS_DOCKER_VERSION=2.53.0 SORMAS_VERSION=1.92.0 # only needed for CI build systems SORMAS_DEMIS_VERSION=1.38.0