Specify service images from the compose file

reset data for 2.1 installations unless running on STRLTEST

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

config.json

@@ -1,13 +1,8 @@
 {
   "name": "streamline-emr",
   "org": "streamline",
-  "version": "2.0",
+  "version": "2.1.1",
   "platforms": [
     "linux/arm64"
-  ],
+  ]
-  "images": {
-    "linux/arm64": {
-      "registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/arm64:v2": "streamline-emr:latest"
-    }
-  }
 }

install.sh

@@ -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,9 +37,14 @@ if [ -f ${INSTALL_ROOT}/stop ]; then
   ${INSTALL_ROOT}/stop
 fi
 
-# reset data for any v1 installations
+# reset data for any version '1.*' or '2.0*' installations
-if grep -q "^1." ${VERSION_FILE}; then
+if grep -q "^1." ${VERSION_FILE} || grep -q "^2.0" ${VERSION_FILE}; then
-  echo "v1 installation detected - resetting data"
+  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
 

src/docker-compose.yml

@@ -1,12 +1,13 @@
 services:
   streamline-emr:
-    image: ${APP_IMAGE:-streamline-emr:latest}
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/arm64:v2.1
-    container_name: ${APP_CONTAINER:-streamline-emr}
+    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: