Integrate streamline-emr service with Traefik

config.json

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

docker/Dockerfile.streamline-emr.arm64

@@ -1 +1 @@
-FROM streamline:signalytic_latest
+FROM streamlinehealth/streamline:signalytic

scripts/clientappctl

@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 
-import sys, os, argparse, json, shutil, subprocess, traceback
+import sys, os, argparse, json, shutil, tempfile, subprocess, traceback
 
 def run_script(script_path: str) -> int:
     """
@@ -45,8 +45,7 @@ def handle_start(src_dir, install_path):
         shutil.copytree(src_dir, install_path, dirs_exist_ok=True)
 
         # start application
-        if run_script(f'{install_path}/start') != 0:
+        run_script(f'{install_path}/start')
-            return 1
 
         return 0
     except Exception as ex:
@@ -68,8 +67,7 @@ def handle_stop(install_path: str):
 
     try:
         # stop application
-        if run_script(f'{install_path}/stop') != 0:
+        run_script(f'{install_path}/stop')
-            return 1
 
         return 0
     except subprocess.CalledProcessError as e:
@@ -120,7 +118,7 @@ def uninstall_app(args: argparse.Namespace, install_path) -> int:
             subprocess.check_output(stop_path)
         
         # reset vols, networks
-        subprocess.check_output(['docker', 'compose', '-f', f'{install_path}/docker-compose.yml', 'down', '-v'])
+        subprocess.check_output(['docker', 'compose', f'-f {install_path}/docker-compose.yml', 'down', '-v'])
 
         if os.path.exists(install_path):
             shutil.rmtree(install_path)
@@ -131,7 +129,11 @@ def uninstall_app(args: argparse.Namespace, install_path) -> int:
     return rval
 
 # script constants
-working_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+utils_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+temp_dir = tempfile.mkdtemp()
+build_dir = os.path.join(temp_dir, 'build')
+staging_dir = os.path.join(temp_dir, 'staging')
+working_dir = working_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 src_path = os.path.join(working_dir, 'src')
 CONFIG_JSON = os.path.join(working_dir, 'config.json')
 

src/docker-compose.yml

@@ -1,8 +1,22 @@
 services:
   streamline-emr:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:3.4
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:3.2
     container_name: streamline-emr
     restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.streamline.rule=Host(`streamline.signalytic.lan`)"
+      - "traefik.http.routers.streamline.entrypoints=websecure"
+      - "traefik.http.routers.streamline.tls=true"
+      - "traefik.http.routers.streamline.priority=2"
+      - "traefik.http.routers.streamline.service=streamline"
+      - "traefik.http.routers.streamline.middlewares=streamline-https"
+      - "traefik.http.services.streamline.loadbalancer.server.port=80"
+      - "traefik.http.middlewares.streamline-https.headers.customrequestheaders.X-Forwarded-Proto=https"
+      - "traefik.http.middlewares.streamline-https.headers.customrequestheaders.X-Forwarded-Port=443"
+      - "traefik.http.middlewares.streamline-https.headers.sslProxyHeaders.X-Forwarded-Proto=https"
+      - "traefik.docker.network=signalytic-proxy"
+      - "traefik.http.middlewares.streamline-https.headers.contentSecurityPolicy=upgrade-insecure-requests"
     volumes:
         - "${DATA_DIR:-./data}:/var/lib/mysql"
     ports:
@@ -16,6 +30,8 @@ services:
       start_interval: 10s
       interval: 30s
       retries: 5
+    networks:
+      - signalytic-proxy
 
   statistics:
     image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:3.1
@@ -47,3 +63,7 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
+
+networks:
+  signalytic-proxy:
+    external: true