From 8be42267097f52014d4609f949224f4dedd06257 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 31 Jan 2024 15:50:06 +0100 Subject: [PATCH 1/3] HSP-6560 add libxml2-dev --- Rscript/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rscript/Dockerfile b/Rscript/Dockerfile index 25d37013..161e9a8f 100644 --- a/Rscript/Dockerfile +++ b/Rscript/Dockerfile @@ -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 --no-install-recommends\ && apt-get clean RUN R -e "install.packages('epicontacts', version='1.1.0', repos='http://cran.rstudio.com/')" From 24397e0e1a8417ba2fdf30bc1e434860c33f5430 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Wed, 31 Jan 2024 17:47:33 +0100 Subject: [PATCH 2/3] HSP-6560 add libglpk-dev --- Rscript/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rscript/Dockerfile b/Rscript/Dockerfile index 161e9a8f..6f0ebd4c 100644 --- a/Rscript/Dockerfile +++ b/Rscript/Dockerfile @@ -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 libxml2-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/')" From dcf3c0c722ecfbc3f53a6b9b57e73507186d589f Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Mon, 5 Feb 2024 09:16:44 +0100 Subject: [PATCH 3/3] HSP-6572 new sormas release --- .env | 6 +++--- apache2/Dockerfile | 4 ++-- keycloak/Dockerfile | 2 +- letsencrypt/Dockerfile | 2 +- sormas/Dockerfile | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env b/.env index d17942de..4256d0d0 100644 --- a/.env +++ b/.env @@ -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/ diff --git a/apache2/Dockerfile b/apache2/Dockerfile index f8147d60..410ab9d5 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.93.0 +ARG SORMAS_VERSION=1.94.0 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3 ENV SORMAS_VERSION=$SORMAS_VERSION @@ -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/ diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 5690f5f5..e64c6cd8 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.93.0 +ARG SORMAS_VERSION=1.94.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 a108b4dc..fb59fa76 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.93.0 +ARG SORMAS_VERSION=1.94.0 ENV SORMAS_VERSION=$SORMAS_VERSION LABEL maintainer="aptalca" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index c7950443..11dded23 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.93.0 +ARG SORMAS_VERSION=1.94.0 ENV SORMAS_VERSION=$SORMAS_VERSION ENV MAIL_FROM=root@localhost