Skip to content

Commit

Permalink
Merge pull request #593 from SORMAS-Foundation/HSP-6572-sormas-1-94-0
Browse files Browse the repository at this point in the history
Hsp 6572 sormas 1 94 0
  • Loading branch information
fhauptmann authored Feb 5, 2024
2 parents 0002dd1 + dcf3c0c commit 1ed168b
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 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.54.0-rc2
SORMAS_VERSION=1.93.0
SORMAS_DOCKER_VERSION=2.55.0-rc1
SORMAS_VERSION=1.94.0
# only needed for CI build systems
SORMAS_DEMIS_VERSION=1.39.0
SORMAS_DEMIS_VERSION=1.40.0

SORMAS_SERVER_URL=sormas-docker-test.com
SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
Expand Down
2 changes: 1 addition & 1 deletion Rscript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apt update -qq \
&& add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get -y install r-base libpq-dev gcc build-essential gfortran libblas-dev liblapack-dev --no-install-recommends\
&& apt-get -y install r-base libpq-dev gcc build-essential gfortran libblas-dev liblapack-dev libxml2-dev libglpk-dev --no-install-recommends\
&& apt-get clean

RUN R -e "install.packages('epicontacts', version='1.1.0', repos='http://cran.rstudio.com/')"
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.93.0
ARG SORMAS_VERSION=1.94.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.93.0
ARG SORMAS_VERSION=1.94.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.93.0
ARG SORMAS_VERSION=1.94.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.93.0
ARG SORMAS_VERSION=1.94.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.93.0
ARG SORMAS_VERSION=1.94.0
ENV SORMAS_VERSION=$SORMAS_VERSION

ENV MAIL_FROM=root@localhost
Expand Down

0 comments on commit 1ed168b

Please sign in to comment.