Compare commits

...
15 Commits
Author SHA1 Message Date
AlbertBuluma 69c5fd8fe2 Rename to .env 2025-07-22 12:23:39 +03:00
AlbertBuluma fdc5645341 Remove attribute placeholders 2025-07-22 12:22:10 +03:00
AlbertBuluma f14359b3cd Add env file for statistics docker compose service 2025-07-15 15:39:19 +03:00
AlbertBuluma 60021ae47a Use env_file service attribute 2025-07-15 15:21:50 +03:00
alec.turner 3d2844a59b Merge branch 'update-2.6' into 'main'
Release 2.6

See merge request signalytic/client-external/streamline/streamline-emr!19
2025-04-25 14:41:33 +00:00
root 2c1067c1ae update to version v2.6
- updated streamline image to fix issue with missing database migrations
2025-04-24 21:59:11 +00:00
alec.turner 113d8ba7a8 Merge branch 'develop' into 'main'
Release 2.5

See merge request signalytic/client-external/streamline/streamline-emr!18
2025-04-23 15:05:00 +00:00
alec.turner 9857664bfd Merge branch 'update_statistics_image' into 'develop'
update statistics image and bump version to 2.5

See merge request signalytic/client-external/streamline/streamline-emr!17
2025-04-23 14:04:05 +00:00
root 375bad1f1a update streamline and statistics images
The previous statistics image (2.5-rc1) was replaced with a new version 2.5-rc2.
Version 2.5 is specified in the compose file and currently matches 2.5-rc2. The
streamline-emr image is also updated, now specifying version 2.5. For
consistency, the redis image is re-tagged with 2.5 as well, but the image itself
has not been changed.
2025-04-22 18:13:09 +00:00
root a738c4bb37 update statistics image and bump version to 2.5
The statistics image is updated to the latest available as of 2025-04-22, image
ID e0705e6cb218. This image was retagged with v2.5. The version is also updated
in the config file, now 2.5.
2025-04-22 16:07:39 +00:00
alec.turner 6084f7d6cb Merge branch 'develop' into 'main'
Release 2.4

See merge request signalytic/client-external/streamline/streamline-emr!16
2025-04-11 18:52:49 +00:00
alec.turner 0b68ff9e15 Merge branch '5-statistics-service-overwrites-script-used-for-updates' into 'develop'
Resolve "statistics service overwrites script used for updates"

Closes #5

See merge request signalytic/client-external/streamline/streamline-emr!15
2025-04-11 18:46:18 +00:00
root 77bbb74ebd add helper script build-install-local.sh
This helper script is used to build and install an 'app-only' version of the
package onto the local system. This is intendend to be used on the VM as a way
to quickly test new updates to the configuration files using images already
available on the system. This is MUCH faster than packaging with images.
2025-04-11 17:54:39 +00:00
root bd0919a538 update statistics image to v2.4 and bump config version to v2.4
The updated statistics image now pulls data from the database once per day, but
attempts to upload hourly to prevent large delays due to poor network
connectivity.
2025-04-11 17:53:07 +00:00
alec.turner aa7b64e0b9 remove volumes from statistics service and move environment variables to compose
Previously, two volumes were bound to the statistics service. Both are removed
here. The first volume was a .env file, whose contents are now moved to the
compose file under the 'environment' keyword. The second, enabling persistent
storage for the /app folder, also caused the crucial 'fetch_and_update.php' to
be overwritten. Persistent storage is not currently necessary within this
service.
2025-04-09 16:09:46 -07:00
4 changed files with 36 additions and 17 deletions
+25
View File
@@ -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."
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "streamline-emr",
"org": "streamline",
"version": "2.3",
"version": "2.6",
"platforms": [
"linux/arm64"
]
+9 -10
View File
@@ -1,12 +1,12 @@
services:
streamline-emr:
image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:2.3
image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:2.6
container_name: streamline-emr
restart: unless-stopped
volumes:
- "${DATA_DIR:-./data}:/var/lib/mysql"
- ./data:/var/lib/mysql
ports:
- "${APP_PORT:-3000}:80"
- "3000:80"
command: |
php artisan migrate --force && exec php artisan serve --host=0.0.0.0 --port=80
healthcheck:
@@ -18,24 +18,23 @@ 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.6
container_name: streamline-emr-statistics
restart: unless-stopped
volumes:
- "${STATISTICS_ENV:-./resources/statistics.env}:/app/statistics.env"
- "${STATISTICS_DATA_DIR:-./statistics_data}:/app"
env_file:
- resources/statistics/.env
depends_on:
- streamline-emr
- redis
redis:
image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/redis/arm64:2.3
image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/redis/arm64:2.6
container_name: streamline-emr-redis
restart: unless-stopped
volumes:
- "${REDIS_DATA_DIR:-./redis_data}:/data"
- ./redis_data:/data
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 30s
timeout: 10s
retries: 3
retries: 3
@@ -1,15 +1,10 @@
# 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
REDIS_TTL=432000