Changes for release v2.0.4: added MAP_ZOOM and docker-compose without…

… db (#39) Co-authored-by: Adrian Sorge <aso@localhost.localdomain>
SORMAS-Foundation · May 11, 2020 · e00ce6d · e00ce6d
1 parent 1bf84e8
commit e00ce6d
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 2 deletions.
diff --git a/.env b/.env
@@ -1,7 +1,7 @@
 SORMAS_POSTGRES_PASSWORD=password
 
 SORMAS_POSTGRES_USER=sormas_user
-SORMAS_DOCKER_VERSION=2.0.3
+SORMAS_DOCKER_VERSION=2.0.4
 SORMAS_VERSION=1.39.2
 SORMAS_SERVER_URL=sormas-docker-test.com
 SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
@@ -18,6 +18,7 @@ EMAIL_SENDER_ADDRESS=noreply@sormas-docker-test.com
 EMAIL_SENDER_NAME=SORMAS
 LATITUDE=52.2109803
 LONGITUDE=10.5314925
+MAP_ZOOM=10
 MAIL_FROM="root@localhost"
 SORMAS_PATH=/srv/dockerdata/sormas
 APPSERVER_JVM_MAX=4096M

diff --git a/docker-compose-external-db.yml b/docker-compose-external-db.yml
@@ -0,0 +1,55 @@
+version: '2.2'
+services:
+  sormas:
+    restart: unless-stopped
+    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_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}
+    depends_on:
+      - postgres
+    volumes:
+      - ${SORMAS_PATH}/custom:/opt/sormas/custom
+    cpus: ${APPSERVER_CPUS}
+    mem_limit: ${APPSERVER_MEM}
+    mem_reservation: ${APPSERVER_MEM_RESERVED}
+  apache2:
+    restart: unless-stopped
+    links:
+      - sormas
+    depends_on:
+      - sormas
+    image: hzibraunschweig/sormas-apache2:${SORMAS_DOCKER_VERSION}
+    environment:
+      - SORMAS_SERVER_URL=${SORMAS_SERVER_URL}
+      - TZ=${TZ}
+    volumes:
+      - ./apache2/certs:/usr/local/apache2/certs
+      - ${SORMAS_PATH}/apache2_log:/var/log/apache2
+    ports:
+      - 443:443
+      - 80:80
+    cpus: ${WEBSERVER_CPUS}
+    mem_limit: ${WEBSERVER_MEM}
+    mem_reservation: ${WEBSERVER_MEM_RESERVED}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,6 +23,7 @@ services:
       - 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}

diff --git a/docker-compose_nginx.yml b/docker-compose_nginx.yml
@@ -23,6 +23,7 @@ services:
       - 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}

diff --git a/sormas/start-server.sh b/sormas/start-server.sh
@@ -106,7 +106,7 @@ sed -i "s/#email.sender.name=.*/email.sender.name=/" ${DOMAIN_DIR}/sormas.proper
 sed -i "s/email.sender.name=.*/email.sender.name=${EMAIL_SENDER_NAME}/" ${DOMAIN_DIR}/sormas.properties
 sed -i "s/country.center.latitude=.*/country.center.latitude=${LATITUDE}/" ${DOMAIN_DIR}/sormas.properties
 sed -i "s/country.center.longitude=.*/country.center.longitude=${LONGITUDE}/" ${DOMAIN_DIR}/sormas.properties
-sed -i "s/map.zoom=.*/map.zoom=10/" ${DOMAIN_DIR}/sormas.properties
+sed -i "s/map.zoom=.*/map.zoom=${map_zoom}/" ${DOMAIN_DIR}/sormas.properties
 sed -i "s;app.url=.*;app.url=https://${SORMAS_SERVER_URL}/downloads/release/sormas-${SORMAS_VERSION}-release.apk;" ${DOMAIN_DIR}/sormas.properties
 sed -i "s/\#geocodingOsgtsEndpoint=.*/geocodingOsgtsEndpoint=https:\/\/sg.geodatenzentrum.de\/gdz_geokodierung_bund__${GEO_UUID}/" ${DOMAIN_DIR}/sormas.properties
 sed -i "s/\#rscript.executable=.*/rscript.executable=Rscript/" ${DOMAIN_DIR}/sormas.properties