diff --git a/build-install-local.sh b/build-install-local.sh new file mode 100755 index 00000000..a50d3ba7 --- /dev/null +++ b/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." diff --git a/config.json b/config.json index bfe93151..721fbb49 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { "name": "streamline-emr", "org": "streamline", - "version": "2.3", + "version": "2.4", "platforms": [ "linux/arm64" ] diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 355df5c7..e9959ecf 100755 --- a/src/docker-compose.yml +++ b/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: - - "${STATISTICS_ENV:-./resources/statistics.env}:/app/statistics.env" - - "${STATISTICS_DATA_DIR:-./statistics_data}:/app" + environment: + SERVER: https://impactdashboard.streamlinehealth.tech/ + 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 \ No newline at end of file + retries: 3 diff --git a/src/resources/statistics.env b/src/resources/statistics.env deleted file mode 100644 index ac3444ee..00000000 --- a/src/resources/statistics.env +++ /dev/null @@ -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 \ No newline at end of file