Skip to content

Commit

Permalink
Merge pull request #602 from SORMAS-Foundation/HSP-6724-sormas-1-96-0
Browse files Browse the repository at this point in the history
Hsp 6724 sormas 1 96 0
  • Loading branch information
fhauptmann authored Apr 30, 2024
2 parents f57ad27 + 6d1fcd0 commit 97044de
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SORMAS_POSTGRES_PASSWORD=password
SORMAS_POSTGRES_USER=sormas_user

SORMAS_DOCKER_VERSION=2.56.1
SORMAS_VERSION=1.95.1
SORMAS_DOCKER_VERSION=2.57.0
SORMAS_VERSION=1.96.0

# only needed for CI build systems
SORMAS_DEMIS_VERSION=1.42.0
Expand Down
8 changes: 6 additions & 2 deletions apache2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
FROM httpd:2.4-alpine as build
ARG SORMAS_SERVER_URL

ARG SORMAS_VERSION=1.95.1
ARG SORMAS_VERSION=1.96.0
ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3

ENV SORMAS_VERSION=$SORMAS_VERSION
ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/





RUN apk update --no-cache && \
apk upgrade --no-cache

Expand All @@ -32,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.95.1
ARG SORMAS_VERSION=1.96.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.95.1
ARG SORMAS_VERSION=1.96.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.95.1
ARG SORMAS_VERSION=1.96.0

ENV SORMAS_VERSION=$SORMAS_VERSION
LABEL maintainer="aptalca"
Expand Down
3 changes: 1 addition & 2 deletions sormas/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ ARG MAIL_FROM=sormas@localhost
ARG JVM_MAX=4096m
ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
EXPOSE 6080

ARG SORMAS_VERSION=1.95.1
ARG SORMAS_VERSION=1.96.0
ENV SORMAS_VERSION=$SORMAS_VERSION

ENV MAIL_FROM=root@localhost
Expand Down

0 comments on commit 97044de

Please sign in to comment.