Specify service images from the compose file

Clean up compose file definitions
Added the statistics service to the stack
2026-09-11 18:51:31 +00:00 · 2025-03-24 15:19:19 -06:00 · 2025-03-21 15:49:13 -06:00 · 2025-03-21 13:39:25 -06:00 · 2025-01-24 18:00:36 +00:00 · 2025-01-23 09:49:35 -08:00
4 changed files with 25 additions and 12 deletions
@@ -1,13 +1,8 @@
 {
  "name": "streamline-emr",
  "org": "streamline",
-  "version": "2.1",
+  "version": "2.1.1",
  "platforms": [
    "linux/arm64"
-  ],
-  "images": {
-    "linux/arm64": {
-      "registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/arm64:v2.1": "streamline-emr:latest"
-    }
-  }
+  ]
 }
@@ -25,6 +25,7 @@ fi

 set -e

+NODEID=$(grep ^nodeID /etc/signalytic/identity 2>/dev/null | cut -d= -f2 | xargs)
 APP_SLUG="streamline_emr"
 ORG_SLUG="streamline"
 INSTALL_ROOT="/var/signalytic/clientapps/${ORG_SLUG}/${APP_SLUG}"
@@ -36,10 +37,15 @@ if [ -f ${INSTALL_ROOT}/stop ]; then
  ${INSTALL_ROOT}/stop
 fi

-# reset data for any v1 or v2.0 installations
+# reset data for any version '1.*' or '2.0*' installations
 if grep -q "^1." ${VERSION_FILE} || grep -q "^2.0" ${VERSION_FILE}; then
  echo "demo installation detected (v$(cat ${VERSION_FILE})) - resetting data"
  rm -rf ${DATA_ROOT}
+
+# reset data for version '2.1' installations, unless running on node STRLTEST
+elif [ "${NODEID}" != "STRLTEST" ] && grep -q "^2.1$" ${VERSION_FILE}; then
+  echo "demo installation detected (v2.1) - resetting data"
+  rm -rf ${DATA_ROOT}
 fi

 # copy root files (if present)
@@ -1,12 +1,13 @@
 services:
  streamline-emr:
-    image: ${APP_IMAGE:-streamline-emr:latest}
-    container_name: ${APP_CONTAINER:-streamline-emr}
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/arm64:v2.1
+    container_name: streamline-emr
    restart: unless-stopped
    volumes:
        - "${DATA_DIR:-./data}:/var/lib/mysql"
    ports:
      - "${APP_PORT:-3000}:80"
+    command: ["sh", "-c", "composer install && php artisan migrate"]
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:80"]
      timeout: 30s
@@ -14,4 +15,15 @@ services:
      start_interval: 10s
      interval: 30s
      retries: 5
-
+    networks:
+      - streamline
+  statistics:
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:2.2
+    container_name: statistics
+    restart: unless-stopped
+    depends_on:
+      - streamline-emr
+    networks:
+      - streamline
+networks:
+  streamline:
Author	SHA1	Message	Date
Patrick Gregorio	70dbd3c67f	Specify service images from the compose file	2025-03-24 15:19:19 -06:00
Patrick Gregorio	0eef8850b6	Clean up compose file definitions	2025-03-21 15:49:13 -06:00
Patrick Gregorio	ece5b499f8	Added the statistics service to the stack	2025-03-21 13:39:25 -06:00
alec.turner	204141eca8	Merge branch 'reset-data-for-2.1-except-strltest' into 'release-2.1-omit-strltest' reset data for 2.1 installations unless running on STRLTEST See merge request signalytic/client-external/streamline/streamline-emr!12	2025-01-24 18:00:36 +00:00
alec.turner	6d26a3abcf	reset data for 2.1 installations unless running on STRLTEST A second condition is checked for when determining whether demo data must be reset; if version '2.1' of the app is installed and the target is not node STRLTEST, data will be reset. Note that the version must be exactly '2.1', not '2.1*'. The updated version will be '2.1.1' This commit is added to handle an issue with a previously deployed version where the incorrect install script was included. Node STRLTEST was manually fixed and new data added to the database, leading to the need for this exception.	2025-01-23 09:49:35 -08:00