Skip to content

Commit

Permalink
Merge pull request #587 from SORMAS-Foundation/HSP-6458-freigabe-sorm…
Browse files Browse the repository at this point in the history
…as-1-92-0

Hsp 6458 freigabe sormas 1 92 0
  • Loading branch information
jp-sgent authored Dec 12, 2023
2 parents 81f08b8 + ec2cde1 commit a77c386
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
SORMAS_POSTGRES_PASSWORD=password
SORMAS_POSTGRES_USER=sormas_user

SORMAS_DOCKER_VERSION=2.52.0
SORMAS_VERSION=1.91.0
SORMAS_DOCKER_VERSION=2.53.0
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/
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.91.0
ARG SORMAS_VERSION=1.92.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.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/
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.91.0
ARG SORMAS_VERSION=1.92.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.91.0
ARG SORMAS_VERSION=1.92.0

ENV SORMAS_VERSION=$SORMAS_VERSION
LABEL maintainer="aptalca"
Expand Down
6 changes: 3 additions & 3 deletions postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM postgres:14.9-alpine3.17
FROM postgres:14.10-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
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.91.0
ARG SORMAS_VERSION=1.92.0
ENV SORMAS_VERSION=$SORMAS_VERSION

ENV MAIL_FROM=root@localhost
Expand Down

0 comments on commit a77c386

Please sign in to comment.