Merge branch 'develop' into 'main'

Release 2.4

See merge request signalytic/client-external/streamline/streamline-emr!16

build-install-local.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# build an app-only package (ie don't include images) and store the package path
+echo "building app-only package"
+package=$(${LOCATION}/package --app | awk -F'saved package: ' '/^saved package: / {print $2}')
+echo "generated package: {package}"
+
+# use a temp folder for unpacking and make sure to clean up when done
+tmp="/tmp/build-install-local-$(date +%s)"
+echo "prepping temp folder: {tmp}"
+rm -rf $tmp
+mkdir -p $tmp
+trap 'rm -rf $tmp' EXIT
+
+# unpack to temp folder
+echo "unpacking app package: $package"
+tar xf $package -C $tmp
+
+# install package
+echo "installing package"
+${tmp}/*/install.sh
+
+echo "done."

config.json

@@ -1,7 +1,7 @@
 {
   "name": "streamline-emr",
   "org": "streamline",
-  "version": "2.3",
+  "version": "2.4",
   "platforms": [
     "linux/arm64"
   ]

src/docker-compose.yml

@@ -18,12 +18,20 @@ services:
       retries: 5
 
   statistics:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:2.3
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:2.4
     container_name: streamline-emr-statistics
     restart: unless-stopped
-    volumes:
+    environment:
-      - "${STATISTICS_ENV:-./resources/statistics.env}:/app/statistics.env"
+      SERVER: https://impactdashboard.streamlinehealth.tech/
-      - "${STATISTICS_DATA_DIR:-./statistics_data}:/app"
+      SERVER_ENDPOINT: signalytic/receive_data
+      SERVER_STATUS_URL: signalytic/status
+      DB_HOST: streamline-emr
+      DB_DATABASE: streamline
+      DB_USERNAME: root
+      DB_PASSWORD: streamline
+      REDIS_HOST: streamline-emr-redis
+      REDIS_PORT: 6379
+      REDIS_TTL: 432000
     depends_on:
       - streamline-emr
       - redis
@@ -38,4 +46,4 @@ services:
       test: ["CMD", "redis-cli", "ping"]
       interval: 30s
       timeout: 10s
-      retries: 3
+      retries: 3

src/resources/statistics.env

@@ -1,15 +0,0 @@
-# server endpoint
-SERVER=https://impactdashboard.streamlinehealth.tech/
-SERVER_ENDPOINT=signalytic/receive_data
-SERVER_STATUS_URL=signalytic/status
-
-# Database variables
-DB_HOST=streamline-emr
-DB_DATABASE=streamline
-DB_USERNAME=root
-DB_PASSWORD=streamline
-
-# Redis variables
-REDIS_HOST=streamline-emr-redis
-REDIS_PORT=6379
-REDIS_TTL=432000  # 5Days