From 2f6f2237186b5954043375134798a67f2b295795 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Thu, 25 May 2023 16:57:12 +0200 Subject: [PATCH 1/4] HSP-4628 fix url --- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- Jenkinsfile | 4 ++-- Jenkinsfile_pgdump-only | 4 ++-- Jenkinsfile_pushContainer | 2 +- README.md | 8 ++++---- apache2/Dockerfile | 4 ++-- build_lbds.Jenkinsfile | 2 +- build_polling_github.Jenkinsfile | 2 +- keycloak/Dockerfile | 2 +- keycloak/README.md | 2 +- lbds/Jenkinsfile | 2 +- letsencrypt/Dockerfile | 2 +- payara/Dockerfile | 2 +- sormas/Dockerfile | 2 +- sormas/start-server.sh | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 856a50374..e105781d5 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -31,4 +31,4 @@ jobs: DEMIS: ${{ env.DEMIS_VERSION }} ## Application release notes - https://github.com/hzi-braunschweig/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }} + https://github.com/sormas-foundation/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed7541b12..291ab6dc8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,4 +31,4 @@ jobs: DEMIS: ${{ env.DEMIS_VERSION }} ## Application release notes - https://github.com/hzi-braunschweig/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }} + https://github.com/sormas-foundation/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }} diff --git a/Jenkinsfile b/Jenkinsfile index 0fa951dcd..9ce6239d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,13 +5,13 @@ node { stage('checkout') { - git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git' + git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git' } stage('set variables') { echo 'Setting variables' SORMAS_VERSION_NIGHTLY= sh ( - script: 'curl -s https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'', + script: 'curl -s https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'', returnStdout: true ).trim() if (params.BUILD_NIGHTLY != null && params.BUILD_NIGHTLY) { diff --git a/Jenkinsfile_pgdump-only b/Jenkinsfile_pgdump-only index 2bc2db297..1ef7a5a55 100644 --- a/Jenkinsfile_pgdump-only +++ b/Jenkinsfile_pgdump-only @@ -3,7 +3,7 @@ node { def SORMAS_VERSION='' stage('checkout') { - git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git' + git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git' } stage('set variables') { @@ -12,7 +12,7 @@ node { sh "sed -i 's,SORMAS_DOCKER_VERSION=.*\$,SORMAS_DOCKER_VERSION=DEVOPS,' ./.env" sh "sed -i '/^GEO_TEMPLATE/d ' ./.env" SORMAS_VERSION= sh ( - script: 'curl -s https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'', + script: 'curl -s https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'', returnStdout: true ).trim() echo "${SORMAS_VERSION}" diff --git a/Jenkinsfile_pushContainer b/Jenkinsfile_pushContainer index 10eee3d36..9d540ce90 100644 --- a/Jenkinsfile_pushContainer +++ b/Jenkinsfile_pushContainer @@ -1,7 +1,7 @@ node { stage('checkout') { - git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git' + git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git' } diff --git a/README.md b/README.md index 764362c9f..8e8f375c5 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ For production usage, ONLY checkout from the release tags, because only these co **SORMAS** (Surveillance Outbreak Response Management and Analysis System) is an open source eHealth system - consisting of separate web and mobile apps - that is geared towards optimizing the processes used in monitoring the spread of infectious diseases and responding to outbreak situations. ## Project Objectives -This project aims to build docker images for the SORMAS application (https://github.com/hzi-braunschweig/SORMAS-Project) +This project aims to build docker images for the SORMAS application (https://github.com/sormas-foundation/SORMAS-Project) ## Firewall @@ -58,11 +58,11 @@ name: admin pw: sadmin All default users are listed here: -https://github.com/hzi-braunschweig/SORMAS-Project/blob/master/docs/SERVER_UPDATE.md#default-logins +https://github.com/sormas-foundation/SORMAS-Project/blob/master/docs/SERVER_UPDATE.md#default-logins If you wish to provide a demologin page, copy the demologin.html to the custom folder (this page uses the default logins): ``` -wget https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/master/sormas-base/setup/demologinmain.html -P /srv/dockerdata/sormas/custom +wget https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/master/sormas-base/setup/demologinmain.html -P /srv/dockerdata/sormas/custom ``` ## Advanced Installation @@ -89,7 +89,7 @@ These Options are available to customize the installation: ### SORMAS **SORMAS_VERSION** Version of SORMAS that should be installed (Dockerimages are provided starting from the Version 1.33.0) -**SORMAS_DOCKER_VERSION** Version of dockerimages (see https://github.com/hzi-braunschweig/SORMAS-Docker/releases for all release) +**SORMAS_DOCKER_VERSION** Version of dockerimages (see https://github.com/sormas-foundation/SORMAS-Docker/releases for all release) **SORMAS_SERVER_URL** URL under which the SORMAS installation should be accessed diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 0344936de..bb8a8943f 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -5,7 +5,7 @@ ARG SORMAS_VERSION=1.82.0 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3 ENV SORMAS_VERSION=$SORMAS_VERSION -ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ +ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ @@ -40,7 +40,7 @@ ARG SORMAS_VERSION=1.82.0 ENV SORMAS_VERSION=$SORMAS_VERSION -ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ +ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ RUN apk update --no-cache && \ apk upgrade --no-cache && \ diff --git a/build_lbds.Jenkinsfile b/build_lbds.Jenkinsfile index b23522ebd..3a7b83150 100644 --- a/build_lbds.Jenkinsfile +++ b/build_lbds.Jenkinsfile @@ -5,7 +5,7 @@ node { stage('checkout') { - git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git' + git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git' } diff --git a/build_polling_github.Jenkinsfile b/build_polling_github.Jenkinsfile index 613ff53f6..63f53199a 100644 --- a/build_polling_github.Jenkinsfile +++ b/build_polling_github.Jenkinsfile @@ -1,7 +1,7 @@ node { stage('checkout') { - git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git' + git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git' } stage('set variables') { diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 65a2b112b..b12681374 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -3,7 +3,7 @@ FROM redhat/ubi8-minimal:latest as config-source USER root RUN microdnf update && microdnf install -y wget unzip -ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ +ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ ARG SORMAS_VERSION=1.82.0 RUN cd /tmp && \ diff --git a/keycloak/README.md b/keycloak/README.md index 48f056e39..7e6ff3c1f 100644 --- a/keycloak/README.md +++ b/keycloak/README.md @@ -80,7 +80,7 @@ After deploy the following configurations have to be done from the Keycloak Admi ### Keycloak Configuration Upgrade -Keycloak configurations changes usually are part of the [SORMAS.json](https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/sormas-base/setup/keycloak/SORMAS.json) file. +Keycloak configurations changes usually are part of the [SORMAS.json](https://github.com/sormas-foundation/SORMAS-Project/blob/development/sormas-base/setup/keycloak/SORMAS.json) file. The SORMAS Keycloak image automatically adds any new realm resources by running the [update-realm.sh](update-realm.sh) script at startup. This only imports new resources and doesn't remove/update existing resources. diff --git a/lbds/Jenkinsfile b/lbds/Jenkinsfile index c99ef8112..8952d606d 100644 --- a/lbds/Jenkinsfile +++ b/lbds/Jenkinsfile @@ -2,7 +2,7 @@ node { stage('checkout') { - git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git' + git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git' } stage('Build') { diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile index c3b75c189..a359190b0 100644 --- a/letsencrypt/Dockerfile +++ b/letsencrypt/Dockerfile @@ -3,7 +3,7 @@ FROM lsiobase/nginx:3.11 # set version label ARG CERTBOT_VERSION=1.3.0 -ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ +ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ ARG SORMAS_VERSION=1.82.0 diff --git a/payara/Dockerfile b/payara/Dockerfile index e68642b19..94caef997 100644 --- a/payara/Dockerfile +++ b/payara/Dockerfile @@ -11,4 +11,4 @@ RUN wget --no-check-certificate -O /tmp/payara-5.2021.10.zip "https://search.mav && 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/hzi-braunschweig/SORMAS-Project/development/sormas-base/setup/glassfish-modules/weld-integration.jar" +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" diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 80d30a5fe..fc898ba1f 100644 --- a/sormas/Dockerfile +++ b/sormas/Dockerfile @@ -11,7 +11,7 @@ ARG DB_NAME_AUDIT=sormas_audit ARG MAIL_HOST=localhost ARG MAIL_FROM=sormas@localhost ARG JVM_MAX=4096m -ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/ +ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/ EXPOSE 6080 ARG SORMAS_VERSION=1.82.0 diff --git a/sormas/start-server.sh b/sormas/start-server.sh index 4e86b7a49..54b4eb747 100644 --- a/sormas/start-server.sh +++ b/sormas/start-server.sh @@ -151,7 +151,7 @@ set -e ${ASADMIN} create-javamail-resource --mailhost ${MAIL_HOST} --mailuser ${EMAIL_SENDER_NAME} --fromaddress ${EMAIL_SENDER_ADDRESS} --auth ${SMTP_AUTH_ENABLED} --enabled ${EMAIL_NOTIFICATION_ENABLED} --property "mail.smtp.port=${SMTP_PORT}:mail.smtp.auth=${SMTP_AUTH_ENABLED}" mail/MailSession -# Fix for https://github.com/hzi-braunschweig/SORMAS-Project/issues/1759 +# Fix for https://github.com/sormas-foundation/SORMAS-Project/issues/1759 ${ASADMIN} set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=500 # set FQDN for sormas domain ${ASADMIN} set configs.config.server-config.http-service.virtual-server.server.hosts=${SORMAS_SERVER_URL} From 883d104e07befa3800d931644c862cd1a640557b Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Fri, 26 May 2023 14:43:30 +0200 Subject: [PATCH 2/4] HSP-4886 new SORMAS Version 1.84.0 and DEMIS 1.29.0 --- .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 99858e020..068ae98c3 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.44.0-rc1 -SORMAS_VERSION=1.83.1 -SORMAS_DEMIS_VERSION=1.28.0 +SORMAS_DOCKER_VERSION=2.45.0-rc1 +SORMAS_VERSION=1.84.0 +SORMAS_DEMIS_VERSION=1.29.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 65f567073..0494c957a 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.83.1 +ARG SORMAS_VERSION=1.84.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.83.1 +ARG SORMAS_VERSION=1.84.0 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index d89e0b67c..0bf362590 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.83.1 +ARG SORMAS_VERSION=1.84.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 eced2bcb9..e589f1e8c 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.83.1 +ARG SORMAS_VERSION=1.84.0 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/sormas/Dockerfile b/sormas/Dockerfile index a04bec782..18ac654ee 100644 --- a/sormas/Dockerfile +++ b/sormas/Dockerfile @@ -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.83.1 +ARG SORMAS_VERSION=1.84.0 ENV SORMAS_VERSION=$SORMAS_VERSION From d3fbb397eb6c9ef7452283b349920fa2b00e6703 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Thu, 15 Jun 2023 09:12:15 +0200 Subject: [PATCH 3/4] HSP-5014 new Hotfix version and new DEMIS Adapter version --- .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 068ae98c3..56c568e2f 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.45.0-rc1 -SORMAS_VERSION=1.84.0 -SORMAS_DEMIS_VERSION=1.29.0 +SORMAS_DOCKER_VERSION=2.45.1-rc1 +SORMAS_VERSION=1.84.1 +SORMAS_DEMIS_VERSION=1.29.1 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 0494c957a..c6d7c0246 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.0 +ARG SORMAS_VERSION=1.84.1 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.0 +ARG SORMAS_VERSION=1.84.1 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 0bf362590..1ccf7892c 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.0 +ARG SORMAS_VERSION=1.84.1 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 e589f1e8c..fd9f09ff3 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.0 +ARG SORMAS_VERSION=1.84.1 ENV SORMAS_VERSION=$SORMAS_VERSION diff --git a/sormas/Dockerfile b/sormas/Dockerfile index 18ac654ee..d35a3f496 100644 --- a/sormas/Dockerfile +++ b/sormas/Dockerfile @@ -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.0 +ARG SORMAS_VERSION=1.84.1 ENV SORMAS_VERSION=$SORMAS_VERSION From f2b9d4a43281fb4580f128cf2da4e5567c7d5e71 Mon Sep 17 00:00:00 2001 From: Frank Hauptmann Date: Tue, 20 Jun 2023 14:32:40 +0200 Subject: [PATCH 4/4] HSP-5062 Release approval --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 56c568e2f..2d2ae61a2 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ SORMAS_POSTGRES_PASSWORD=password SORMAS_POSTGRES_USER=sormas_user -SORMAS_DOCKER_VERSION=2.45.1-rc1 +SORMAS_DOCKER_VERSION=2.45.1 SORMAS_VERSION=1.84.1 SORMAS_DEMIS_VERSION=1.29.1