-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* pg_dump: schedule crons on a random basis. Keep dumps for 5 hours (default) * remove cron entries for db_dump in docker-compose.yml * less jobs during night times and keep the last 10 dumps * Setup documents directory and corresponding docker volume Related to SORMAS-Foundation/SORMAS-Project#2328 * release 2.13.1 * ADD timeouts Payara-Server für transactions auf 0 * added vim to containers and prepared release 2.13.2 * sormas: updated properties for symptom journal and patient diary (#143) * Release 2.14.0 * Update .env * Create docker-compose-sb.yml * Release 2.14.0-rc2 * v2.14.0 (#148) * Enable log_min_duration_statement and set to 5 sec * Set documents logging level to ERROR * Change document log level to WARN * Add missing PIA envs to sormas service * Don't using duplicated envs * Release 2.14.0 Co-authored-by: akm <[email protected]> Co-authored-by: Tom Hutter <[email protected]> Co-authored-by: Thomas Broyer <[email protected]> Co-authored-by: Adrian <[email protected]> Co-authored-by: Adrian Sorge <[email protected]> Co-authored-by: robbmue <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: akm <[email protected]>
- Loading branch information
8 people
authored
Dec 14, 2020
1 parent
4ef9677
commit 35213e1
Showing
10 changed files
with
171 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| version: '2.3' | ||
|
|
||
| networks: | ||
| sormas: | ||
| name: sormas | ||
|
|
||
| services: | ||
| sormas: | ||
| restart: unless-stopped | ||
| labels: | ||
| - autoheal=true | ||
| # override for stop timeout seconds during restart | ||
| - autoheal.stop.timeout=30 | ||
| links: | ||
| - postgres | ||
| image: hzibraunschweig/sormas-application:${SORMAS_DOCKER_VERSION} | ||
| environment: | ||
| - SORMAS_POSTGRES_USER=${SORMAS_POSTGRES_USER} | ||
| - SORMAS_POSTGRES_PASSWORD=${SORMAS_POSTGRES_PASSWORD} | ||
| - SORMAS_SERVER_URL=${SORMAS_SERVER_URL} | ||
| - DB_HOST=${DB_HOST} | ||
| - DOMAIN_NAME=${DOMAIN_NAME} | ||
| - DB_JDBC_MAXPOOLSIZE=${DB_JDBC_MAXPOOLSIZE} | ||
| - DB_NAME=${DB_NAME} | ||
| - DB_NAME_AUDIT=${DB_NAME_AUDIT} | ||
| - MAIL_HOST=${MAIL_HOST} | ||
| - MAIL_FROM=${MAIL_FROM} | ||
| - SORMAS_VERSION=${SORMAS_VERSION} | ||
| - LOCALE=${LOCALE} | ||
| - EPIDPREFIX=${EPIDPREFIX} | ||
| - SEPARATOR=${SEPARATOR} | ||
| - EMAIL_SENDER_ADDRESS=${EMAIL_SENDER_ADDRESS} | ||
| - EMAIL_SENDER_NAME=${EMAIL_SENDER_NAME} | ||
| - LATITUDE=${LATITUDE} | ||
| - LONGITUDE=${LONGITUDE} | ||
| - MAP_ZOOM=${MAP_ZOOM} | ||
| - TZ=${TZ} | ||
| - JVM_MAX=${APPSERVER_JVM_MAX} | ||
| - GEO_UUID=${GEO_UUID} | ||
| - DEVMODE=${DEVMODE} | ||
| - JSON_LOGGING=${JSON_LOGGING} | ||
| - CUSTOMBRANDING_ENABLED=${CUSTOMBRANDING_ENABLED} | ||
| - CUSTOMBRANDING_NAME=${CUSTOMBRANDING_NAME} | ||
| - CUSTOMBRANDING_LOGO_PATH=${CUSTOMBRANDING_LOGO_PATH} | ||
| - CUSTOMBRANDING_USE_LOGINSIDEBAR=${CUSTOMBRANDING_USE_LOGINSIDEBAR} | ||
| - CUSTOMBRANDING_LOGINBACKGROUND_PATH=${CUSTOMBRANDING_LOGINBACKGROUND_PATH} | ||
| - GEO_TEMPLATE=${GEO_TEMPLATE} | ||
| - GEO_LONG_TEMPLATE=${GEO_LONG_TEMPLATE} | ||
| - GEO_LAT_TEMPLATE=${GEO_LAT_TEMPLATE} | ||
| - CASEARCHIVEDAYS=${CASEARCHIVEDAYS} | ||
| - EVENTARCHIVEDAYS=${EVENTARCHIVEDAYS} | ||
| - PIA_URL=${PIA_URL} | ||
| - SJ_URL=https://${PIA_URL}/user/connectSormas | ||
| - SJ_AUTH=https://${PIA_URL}/user/requestToken | ||
| - SJ_CLIENTID=${SJ_CLIENTID} | ||
| - SJ_SECRET=${SJ_SECRET} | ||
| volumes: | ||
| - ${SORMAS_PATH}/documents:/opt/sormas/documents | ||
| - ${SORMAS_PATH}/custom:/opt/sormas/custom | ||
| - ${SORMAS_PATH}/sormas2sormas:/opt/sormas/sormas2sormas | ||
| - ${SORMAS_PATH}/sormas-logs:/opt/domains/sormas/logs | ||
| mem_limit: ${APPSERVER_MEM} | ||
| mem_reservation: ${APPSERVER_MEM_RESERVED} | ||
| healthcheck: | ||
| test: ["CMD", "curl", "-f", "-I", "http://localhost:6080/sormas-ui/login"] | ||
| interval: 30s | ||
| timeout: 7s | ||
| retries: 3 | ||
| start_period: 300s | ||
| depends_on: | ||
| postgres: | ||
| condition: service_healthy | ||
| networks: | ||
| sormas: | ||
|
|
||
| postgres: | ||
| restart: unless-stopped | ||
| labels: | ||
| - autoheal=true | ||
| command: -c 'config_file=/etc/postgresql/postgresql.conf' | ||
| image: hzibraunschweig/sormas-postgres:${SORMAS_DOCKER_VERSION} | ||
| environment: | ||
| - POSTGRES_PASSWORD=${SORMAS_POSTGRES_PASSWORD} | ||
| - DB_NAME=sormas | ||
| - DB_NAME_AUDIT=sormas_audit | ||
| - SORMAS_POSTGRES_PASSWORD=${SORMAS_POSTGRES_PASSWORD} | ||
| - SORMAS_POSTGRES_USER=${SORMAS_POSTGRES_USER} | ||
| - TZ=${TZ} | ||
| volumes: | ||
| - ${SORMAS_PATH}/psqldata:/var/lib/postgresql/data | ||
| ports: | ||
| - "5432:5432" | ||
| mem_limit: ${DB_MEM} | ||
| mem_reservation: ${DB_MEM_RESERVED} | ||
| healthcheck: | ||
| test: ["CMD", "psql", "-U", "${SORMAS_POSTGRES_USER}", "-c", "SELECT 1;", "${DB_NAME}"] | ||
| interval: 30s | ||
| timeout: 3s | ||
| retries: 3 | ||
| start_period: 30s | ||
| networks: | ||
| sormas: | ||
|
|
||
| pg_dump: | ||
| restart: unless-stopped | ||
| image: hzibraunschweig/sormas-pg-dump:${SORMAS_DOCKER_VERSION} | ||
| environment: | ||
| - DB_HOST=${DB_HOST} | ||
| - DB_NAME=sormas | ||
| - DB_NAME_AUDIT=sormas_audit | ||
| - PGPASSWORD=${SORMAS_POSTGRES_PASSWORD} | ||
| - SORMAS_POSTGRES_USER=${SORMAS_POSTGRES_USER} | ||
| - TZ=${TZ} | ||
| volumes: | ||
| - /backup:/var/opt/db_dumps | ||
| cpus: ${DB_DUMP_CPUS} | ||
| mem_limit: ${DB_DUMP_MEM} | ||
| mem_reservation: ${DB_DUMP_MEM_RESERVED} | ||
| depends_on: | ||
| postgres: | ||
| condition: service_healthy | ||
| networks: | ||
| sormas: | ||
|
|
||
| autoheal: | ||
| restart: unless-stopped | ||
| image: willfarrell/autoheal | ||
| environment: | ||
| # watch all running containers. | ||
| - AUTOHEAL_CONTAINER_LABEL=all | ||
| # check every 10 seconds | ||
| - AUTOHEAL_INTERVAL=10 | ||
| # wait 0 seconds before first health check | ||
| - AUTOHEAL_START_PERIOD=0 | ||
| # Docker waits max 10 seconds (the Docker default) for a container to stop before killing | ||
| - AUTOHEAL_DEFAULT_STOP_TIMEOUT=10 | ||
| # Unix socket for curl requests to Docker API | ||
| - DOCKER_SOCK=/var/run/docker.sock | ||
| # --max-time seconds for curl requests to Docker API | ||
| - CURL_TIMEOUT=30 | ||
| volumes: | ||
| - /var/run/docker.sock:/var/run/docker.sock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters