Merge pull request #14 from hzi-braunschweig/development

Development

.env

@@ -1,7 +1,7 @@
 SORMAS_POSTGRES_PASSWORD=password
 
 SORMAS_POSTGRES_USER=sormas_user
-SORMAS_VERSION=1.37.0
+SORMAS_VERSION=1.37.1
 SORMAS_SERVER_URL=sormas-docker-test.com
 
 DB_HOST=postgres
@@ -20,4 +20,3 @@ MAIL_FROM="root@localhost"
 SORMAS_PATH=/srv/dockerdata/sormas
 JVM_MAX=4096m
 TZ=Europe/Berlin
-

apache2/Dockerfile

@@ -1,6 +1,6 @@
 FROM httpd:2.4-alpine
 ARG SORMAS_SERVER_URL
-ENV SORMAS_VERSION=1.37.0
+ENV SORMAS_VERSION=1.37.1
 
 RUN apk add tzdata
 RUN mkdir -p /var/log/apache2/ \

docker-compose.yml

@@ -1,7 +1,8 @@
 version: '3'
 services:
   sormas:
-    links: 
+    restart: unless-stopped
+    links:
       - postgres
     image: hzibraunschweig/sormas-application:${SORMAS_VERSION}
     environment:
@@ -42,6 +43,7 @@ services:
     ports:
       - "5432:5432"
   pg_dump:
+    restart: unless-stopped
     image: hzibraunschweig/sormas-pg-dump:${SORMAS_VERSION}
     environment:
       - DB_HOST=${DB_HOST}

sormas/Dockerfile

@@ -12,7 +12,7 @@ ARG MAIL_FROM=sormas@localhost
 ARG JVM_MAX=4096m
 
 EXPOSE 6080
-ENV SORMAS_VERSION=1.37.0
+ENV SORMAS_VERSION=1.37.1
 
 ENV SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/v${SORMAS_VERSION}/sormas_${SORMAS_VERSION}.zip
 ENV MAIL_FROM=root@localhost

sormas/start-server.sh

@@ -81,6 +81,9 @@ sed -i "s/email.sender.name=.*/email.sender.name=${EMAIL_SENDER_NAME}/" ${DOMAIN
 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;app.url=.*;app.url=https://${SORMAS_SERVER_URL}/downloads/release/sormas-${SORMAS_VERSION}-release.apk;" ${DOMAIN_DIR}/sormas.properties
+
+
 
 # put deployments into place
 for APP in $(ls ${DOMAIN_DIR}/deployments/*.{war,ear} 2>/dev/null);do