Merge branch 'develop' into 'main'

v3.4 updates

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

config.json

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

docker/Dockerfile.streamline-emr.arm64

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

package

@@ -5,6 +5,5 @@ LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CONFIG=${CONFIG:-${LOCATION}/config.json}
 SRC=${SRC:-${LOCATION}/src}
 BUILD_DIR=${BUILD_DIR:-${LOCATION}/build-packages}
-#INSTALL_SCRIPT=${LOCATION}/install.sh
 
 ${LOCATION}/hosted-app-utils/package ${CONFIG} ${SRC} output=${BUILD_DIR} $@

scripts/clientappctl

@@ -45,7 +45,8 @@ def handle_start(src_dir, install_path):
         shutil.copytree(src_dir, install_path, dirs_exist_ok=True)
 
         # start application
-        run_script(f'{install_path}/start')
+        if run_script(f'{install_path}/start') != 0:
+            return 1
 
         return 0
     except Exception as ex:
@@ -67,7 +68,8 @@ def handle_stop(install_path: str):
 
     try:
         # stop application
-        run_script(f'{install_path}/stop')
+        if run_script(f'{install_path}/stop') != 0:
+            return 1
 
         return 0
     except subprocess.CalledProcessError as e:
@@ -95,45 +97,9 @@ def handle_restart(src_path: str, install_path: str):
     return 0
 
 
-def uninstall_app(args: argparse.Namespace, install_path) -> int:
-    """
-    Uninstall application at specified installation directory.
-
-    Args:
-        install_path (str): Path to target installation directory.
-    Returns: 
-        Int
-    """
-
-    rval = 0
-    try:
-
-        # disable application then uninstall
-        disable_path = os.path.join(install_path, 'disable')
-        stop_path    = os.path.join(install_path, 'stop')
-        if os.path.exists(disable_path):
-            subprocess.check_output(disable_path)
-
-        if os.path.exists(stop_path):
-            subprocess.check_output(stop_path)
-        
-        # reset vols, networks
-        subprocess.check_output(['docker', 'compose', f'-f {install_path}/docker-compose.yml', 'down', '-v'])
-
-        if os.path.exists(install_path):
-            shutil.rmtree(install_path)
-    except Exception as e:
-        print(f'Exception encountered: {e}')
-        traceback.print_exc()
-        rval = 1
-    return rval
-
 # script constants
 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__)))
+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,22 +1,8 @@
 services:
   streamline-emr:
-    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:3.2
+    image: registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/streamline-emr/arm64:3.4
     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:
@@ -30,8 +16,6 @@ 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
@@ -63,7 +47,3 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-
-networks:
-  signalytic-proxy:
-    external: true