Skip to content

Commit

Permalink
Merge pull request #574 from SORMAS-Foundation/HSP-6381-sormas-1-91-0
Browse files Browse the repository at this point in the history
Hsp 6381 sormas 1 91 0
  • Loading branch information
jp-sgent authored Nov 20, 2023
2 parents b4806ed + 638685b commit 6a2d369
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
SORMAS_POSTGRES_PASSWORD=password
SORMAS_POSTGRES_USER=sormas_user

SORMAS_DOCKER_VERSION=2.51.0-rc1
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/
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions apache2/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion keycloak/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion letsencrypt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sormas/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6a2d369

Please sign in to comment.