diff --git a/.env b/.env index 2d2ae61a2..fe0414d83 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.45.1 -SORMAS_VERSION=1.84.1 -SORMAS_DEMIS_VERSION=1.29.1 +SORMAS_DOCKER_VERSION=2.46.0 +SORMAS_VERSION=1.85.0 +SORMAS_DEMIS_VERSION=1.30.0 SORMAS_SERVER_URL=sormas-docker-test.com SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ @@ -62,6 +62,8 @@ DB_MEM=5000M DB_MEM_RESERVED=1000M # ALLOWED_FILE_EXTENSIONS=".pdf,.txt,.doc,.docx,.odt,.xls,.xlsx,.ods,.ppt,.pptx,.odp,.jpg,.jpeg,.png,.gif,.msg" +HTTP_TIMEOUT=3600 + KEYCLOAK_DB_MEM=2000M KEYCLOAK_DB_MEM_RESERVED=1000M KEYCLOAK_DB_CPUS=2.0 diff --git a/Rscript/Dockerfile b/Rscript/Dockerfile index d32a422bd..25d37013d 100644 --- a/Rscript/Dockerfile +++ b/Rscript/Dockerfile @@ -1,11 +1,14 @@ -FROM hzibraunschweig/sormas-payara:5.2021.10 +FROM hzibraunschweig/sormas-payara:5.2022.5 ENV DEBIAN_FRONTEND=noninteractive +RUN apt update \ + && apt install -y gpg-agent -RUN apt-get update \ - && apt-get install -y software-properties-common \ +RUN apt update -qq \ + && apt install -y --no-install-recommends software-properties-common dirmngr \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 \ - && add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/' \ + && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \ + && 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\ diff --git a/apache2/Dockerfile b/apache2/Dockerfile index c6d7c0246..1900a0403 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.84.1 +ARG SORMAS_VERSION=1.85.0 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3 ENV SORMAS_VERSION=$SORMAS_VERSION @@ -36,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.84.1 +ARG SORMAS_VERSION=1.85.0 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/apache2/vhost.conf.sh b/apache2/vhost.conf.sh index 74bd7f5f3..a1102b4d9 100755 --- a/apache2/vhost.conf.sh +++ b/apache2/vhost.conf.sh @@ -41,16 +41,16 @@ Listen 443 ProxyRequests Off ProxyPreserveHost On - ProxyPass /sormas-ui http://sormas:6080/sormas-ui connectiontimeout=5 timeout=1800 + ProxyPass /sormas-ui http://sormas:6080/sormas-ui connectiontimeout=5 timeout=${HTTP_TIMEOUT} ProxyPassReverse /sormas-ui http://sormas:6080/sormas-ui - ProxyPass /sormas-rest http://sormas:6080/sormas-rest connectiontimeout=5 timeout=1800 + ProxyPass /sormas-rest http://sormas:6080/sormas-rest connectiontimeout=5 timeout=${HTTP_TIMEOUT} ProxyPassReverse /sormas-rest http://sormas:6080/sormas-rest - ProxyPass /keycloak http://keycloak:8080/keycloak connectiontimeout=5 timeout=600 + ProxyPass /keycloak http://keycloak:8080/keycloak connectiontimeout=5 timeout=${HTTP_TIMEOUT} ProxyPassReverse /keycloak http://keycloak:8080/keycloak - ProxyPass /sormas-angular http://sormas-angular:80/ connectiontimeout=5 timeout=600 + ProxyPass /sormas-angular http://sormas-angular:80/ connectiontimeout=5 timeout=${HTTP_TIMEOUT} ProxyPassReverse /sormas-angular/ http://sormas-angular:80/ - ProxyPass http://sormas:6080/metrics connectiontimeout=5 timeout=600 + ProxyPass http://sormas:6080/metrics connectiontimeout=5 timeout=${HTTP_TIMEOUT} ProxyPassReverse http://sormas:6080/metrics Order deny,allow Deny from all diff --git a/docker-compose-build.yml b/docker-compose-build.yml index 53a69877a..f4965aff5 100644 --- a/docker-compose-build.yml +++ b/docker-compose-build.yml @@ -3,7 +3,7 @@ services: payara: build: context: payara - image: hzibraunschweig/sormas-payara:5.2021.10 + image: hzibraunschweig/sormas-payara:5.2022.5 rscript: depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 1f13b5bb3..515a14b1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,6 +70,7 @@ services: - sormas environment: - PROMETHEUS_SERVERS=${PROMETHEUS_SERVERS} + - HTTP_TIMEOUT=${HTTP_TIMEOUT} volumes: - ./apache2/certs:/usr/local/apache2/certs - ${SORMAS_PATH}/apache2_log:/var/log/apache2 diff --git a/docker-compose_nginx.yml b/docker-compose_nginx.yml index 113838de6..b05b6c863 100644 --- a/docker-compose_nginx.yml +++ b/docker-compose_nginx.yml @@ -109,6 +109,7 @@ services: - EMAIL=${LETSENCRYPT_MAIL} - DISABLE_CERTBOT=${DISABLE_CERTBOT} - PROMETHEUS_SERVERS=${PROMETHEUS_SERVERS} + - HTTP_TIMEOUT=${HTTP_TIMEOUT} volumes: - /var/lib/docker/letsencrypt-config:/config - ./letsencrypt/certs:/config/etc/letsencrypt/live diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 1ccf7892c..139ad6833 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -4,7 +4,7 @@ USER root RUN microdnf update && microdnf install -y wget unzip ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ -ARG SORMAS_VERSION=1.84.1 +ARG SORMAS_VERSION=1.85.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 fd9f09ff3..165bbec8e 100644 --- a/letsencrypt/Dockerfile +++ b/letsencrypt/Dockerfile @@ -5,7 +5,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.84.1 +ARG SORMAS_VERSION=1.85.0 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/letsencrypt/root/defaults/vhost.conf.sh b/letsencrypt/root/defaults/vhost.conf.sh index 9f82311c9..c8ae67487 100755 --- a/letsencrypt/root/defaults/vhost.conf.sh +++ b/letsencrypt/root/defaults/vhost.conf.sh @@ -43,7 +43,7 @@ server { location /sormas-ui { proxy_pass http://sormas:6080/sormas-ui; - proxy_read_timeout 3600s; + proxy_read_timeout ${HTTP_TIMEOUT}s; proxy_set_header X-Forwarded-Host \$host:\$server_port; proxy_set_header X-Forwarded-Server \$host; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; @@ -51,7 +51,7 @@ server { location /sormas-rest { proxy_pass http://sormas:6080/sormas-rest; - proxy_read_timeout 3600s; + proxy_read_timeout ${HTTP_TIMEOUT}s; proxy_set_header X-Forwarded-Host \$host:\$server_port; proxy_set_header X-Forwarded-Server \$host; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; @@ -64,7 +64,7 @@ server { done) deny all; proxy_pass http://sormas:6080/metrics; - proxy_read_timeout 3600s; + proxy_read_timeout ${HTTP_TIMEOUT}s; proxy_set_header X-Forwarded-Host \$host:\$server_port; proxy_set_header X-Forwarded-Server \$host; proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; diff --git a/payara/Dockerfile b/payara/Dockerfile index 94caef997..e0431b176 100644 --- a/payara/Dockerfile +++ b/payara/Dockerfile @@ -5,10 +5,7 @@ RUN apt-get update \ && apt-get -y install wget unzip postgresql vim curl --no-install-recommends\ && apt-get clean -RUN wget --no-check-certificate -O /tmp/payara-5.2021.10.zip "https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/5.2021.10/payara-5.2021.10.zip" \ - && unzip -q -o /tmp/payara-5.2021.10.zip -d /opt/ \ +RUN wget --no-check-certificate -O /tmp/payara-5.2022.5.zip "https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/5.2022.5/payara-5.2022.5.zip" \ + && unzip -q -o /tmp/payara-5.2022.5.zip -d /opt/ \ && rm -R /opt/payara5/glassfish/domains \ - && rm /tmp/payara-5.2021.10.zip - -# remove this below patch after upgraded Payara to higher than 5.2021.10 once (No valid EE environment) is FIXED -RUN wget --no-check-certificate -O /opt/payara5/glassfish/modules/weld-integration.jar "https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/development/sormas-base/setup/glassfish-modules/weld-integration.jar" + && rm /tmp/payara-5.2022.5.zip diff --git a/sormas/Dockerfile b/sormas/Dockerfile index d35a3f496..096e2db19 100644 --- a/sormas/Dockerfile +++ b/sormas/Dockerfile @@ -1,4 +1,4 @@ -FROM hzibraunschweig/sormas-rscript:3.5-5.2021.10 +FROM hzibraunschweig/sormas-rscript:3.5-5.2022.5 ARG SORMAS_POSTGRES_PASSWORD=password ARG SORMAS_POSTGRES_USER=sormas_user @@ -14,7 +14,7 @@ ARG JVM_MAX=4096m ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ EXPOSE 6080 -ARG SORMAS_VERSION=1.84.1 +ARG SORMAS_VERSION=1.85.0 ENV SORMAS_VERSION=$SORMAS_VERSION