Merge branch 'update-3' into 'main'

update image to v3

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

config.json

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

src/docker-compose.yml

@@ -1,12 +1,12 @@
 services:
   streamline-emr:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:2.6
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:v3
     container_name: streamline-emr
     restart: unless-stopped
     volumes:
-        - ./data:/var/lib/mysql
+        - "${DATA_DIR:-./data}:/var/lib/mysql"
     ports:
-      - "3000:80"
+      - "${APP_PORT:-3000}:80"
     command: |
       php artisan migrate --force && exec php artisan serve --host=0.0.0.0 --port=80
     healthcheck:
@@ -18,21 +18,30 @@ services:
       retries: 5
 
   statistics:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:2.6
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:v3
     container_name: streamline-emr-statistics
     restart: unless-stopped
-    env_file:
+    environment:
-      - resources/statistics/.env
+      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
 
   redis:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/redis/arm64:2.6
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/redis/arm64:v3
     container_name: streamline-emr-redis
     restart: unless-stopped
     volumes:
-      - ./redis_data:/data
+      - "${REDIS_DATA_DIR:-./redis_data}:/data"
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 30s

src/resources/statistics/.env

@@ -1,10 +0,0 @@
-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