Merge branch 'master' into development

Author: bendhouseart

.gitignore

@@ -39,5 +39,4 @@ api/*.js.map
 # ssl certs we ignore the content of the folder but keep the folder around.
 nginx/ssl/*
 !nginx/ssl/.gitkeep
-
-*__pycache__*
+*__pycache__*

docker-compose-production.yml

@@ -0,0 +1,102 @@
+version: "3"
+networks:
+    ezbids:
+
+services:
+    mongodb:
+        container_name: brainlife_ezbids-mongodb
+        image: mongo:4.4.15
+        platform: linux/amd64
+        volumes:
+            - /data/db
+        healthcheck:
+            test: echo 'db.runCommand("ping").ok' | mongo localhost:27017/test --quiet
+            interval: 10s
+            timeout: 10s
+            retries:
+                5
+        networks:
+            - ezbids
+
+    api:
+        container_name: brainlife_ezbids-api
+        build: .
+        platform: linux/amd64
+        volumes:
+            - ./api:/app/api
+            - /tmp:/tmp
+        depends_on:
+            mongodb:
+                condition: service_healthy
+        healthcheck:
+            test: ["CMD", "curl", "-f", "http://localhost:8082/health"]
+        working_dir: /app/api
+        command:
+            ./dev.sh
+        environment:
+            MONGO_CONNECTION_STRING: mongodb://mongodb:27017/ezbids
+            BRAINLIFE_AUTHENTICATION: ${BRAINLIFE_AUTHENTICATION}
+        networks:
+            - ezbids
+
+    handler:
+        container_name: brainlife_ezbids-handler
+        build: ./handler
+        platform: linux/amd64
+        volumes:
+            - .:/app
+            - /tmp:/tmp
+        depends_on:
+            mongodb:
+                condition: service_healthy
+            api:
+                condition: service_healthy
+        environment:
+            MONGO_CONNECTION_STRING: mongodb://mongodb:27017/ezbids
+        networks:
+            - ezbids
+        tty: true #turn on color for bids-validator output
+        command: pm2 start handler.js --attach
+
+    ui:
+        container_name: brainlife_ezbids-ui-builder
+        env_file:
+            - .env
+        build: ./ui
+        platform: linux/amd64
+        volumes:
+            - ./ui/dist:/ui/dist
+        environment:
+            VITE_APIHOST: https://${SERVER_NAME}/api
+            VITE_BRAINLIFE_AUTHENTICATION: ${BRAINLIFE_AUTHENTICATION}
+
+    # by default this is not enabled, add COMPOSE_PROFILES=telemetry to your .env
+    telemetry:
+        container_name: brainlife_ezbids-telemetry
+        build: ./telemetry
+        platform: linux/amd64
+        depends_on:
+            - mongodb
+        profiles: ["telemetry"]
+        networks:
+            - ezbids
+
+    nginx:
+        env_file:
+            - .env
+        container_name: brainlife_ezbids-nginx
+        depends_on:
+            - ui
+            - api
+        image: nginx:latest
+        platform: linux/amd64
+        ports:
+            - 443:443
+        networks:
+            - ezbids
+        volumes:
+            - ${SSL_CERT_PATH}:/etc/nginx/conf.d/ssl/sslcert.cert
+            - ${SSL_KEY_PATH}:/etc/nginx/conf.d/ssl/sslcert.key
+            - ${SSL_PASSWORD_PATH}:/etc/nginx/conf.d/ssl/sslpassword
+            - ./nginx/production_nginx.conf:/etc/nginx/conf.d/default.conf
+            - ./ui/dist:/usr/share/nginx/html/ezbids:ro

docker-compose.yml

@@ -65,6 +65,8 @@ services:
 
     ui:
         container_name: brainlife_ezbids-ui
+        env_file:
+            - .env
         build: ./ui
         platform: linux/amd64
         environment:

example.env

@@ -4,6 +4,7 @@
 # of echo $HOSTNAME
 SERVER_NAME=localhost
 
+
 # Set the BRAINLIFE_USE_NGINX environment variable to true to use https"
 # (this will launch the services on port 443) and run with nginx/production_nginx.conf"
 # this will require providing the correct paths for the SSL_CERT_PATH, SSL_KEY_PATH and SSL_PASSWORD_PATH
@@ -33,4 +34,3 @@ PRESORT=false
 # can set a custom workingdir/temp dir all uploaded files and work will be performed in
 # this directory, defaults to /tmp/ezbids-workdir in the docker compose file if it's not set here.
 EZBIDS_TMP_DIR=
-

handler/Dockerfile

@@ -1,6 +1,5 @@
 FROM neurodebian:nd20.04-non-free
 
-
 SHELL ["/bin/bash", "-c"]
 
 ENV DEBIAN_FRONTEND noninteractive

launch.sh

@@ -67,7 +67,6 @@ else
   mkdir -p ${EZBIDS_TMP_DIR}
 fi
 
-
 # ok docker compose is now included in docker as an option for docker
 if [[ $(command -v docker-compose) ]]; then 
     # if the older version is installed use the dash