Merge pull request #130 from JHancox/main

Update MDExpress to include 0.1.19 of TM, 0.1.19 of WM and 0.3.19 of IG

Approved lived on WG meeting 6/8/23! :)

Author: dbericat

deploy/monai-deploy-express/.env

@@ -1,15 +1,15 @@
 # Container Images
-INFORMATICS_GATEWAY_IMAGE=ghcr.io/project-monai/monai-deploy-informatics-gateway:0.3.7
+INFORMATICS_GATEWAY_IMAGE=ghcr.io/project-monai/monai-deploy-informatics-gateway:0.3.19
 INFORMATICS_GATEWAY_CONFIG_IMAGE=dwdraju/alpine-curl-jq:latest
-WORKFLOW_MANAGER_IMAGE=ghcr.io/project-monai/monai-deploy-workflow-manager:2022.12.0-beta.61
-TASK_MANAGER_IMAGE=ghcr.io/project-monai/monai-deploy-task-manager:2022.12.0-beta.61
+WORKFLOW_MANAGER_IMAGE=ghcr.io/project-monai/monai-deploy-workflow-manager:0.1.19
+TASK_MANAGER_IMAGE=ghcr.io/project-monai/monai-deploy-task-manager:0.1.19
 
 MINIO_IMAGE=minio/minio:latest
 MONGODB_IMAGE=mongo:5.0.12
-ORTHANC_IMAGE=osimis/orthanc:22.9.0
-RABBITMQ_IMAGE=rabbitmq:3.10-management
+ORTHANC_IMAGE=osimis/orthanc:23.3.4
+RABBITMQ_IMAGE=rabbitmq:3.11-management
 
-ELK_VERSION=8.4.2
+ELK_VERSION=8.7.0
 ELASTICSEARCH_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
 LOGSTASH_IMAGE=docker.elastic.co/logstash/logstash:${ELK_VERSION}
 KIBANA_IMAGE=docker.elastic.co/kibana/kibana:${ELK_VERSION}

deploy/monai-deploy-express/configs/informatics-gateway.json

@@ -43,8 +43,8 @@
       }
     },
     "storage": {
-      "bufferRootPath": "/payloads",
-      "tempStorageRootPath": "/incoming",
+      "localTemporaryStoragePath": "/payloads",
+      "remoteTemporaryStoragePath": "/incoming",
       "bucketName": "monaideploy",
       "storageRootPath": "/payloads",
       "temporaryBucketName": "monaideploy",

deploy/monai-deploy-express/configs/task-manager.json

@@ -1,11 +1,10 @@
 {
+  "MonaiDeployAuthentication": {
+    "BypassAuthentication": true
+  },
   "WorkloadManagerDatabase": {
     "ConnectionString": "mongodb://root:rootpassword@mongodb:27017",
-    "DatabaseName": "WorkloadManager",
-    "WorkflowCollectionName": "Workflows",
-    "WorkflowInstanceCollectionName": "WorkflowInstances",
-    "PayloadCollectionName": "Payloads",
-    "TaskDispatchEventCollectionName": "TaskDispatchEvents"
+    "DatabaseName": "WorkloadManager"
   },
   "WorkflowManager": {
     "taskTimeoutMinutes": 60,
@@ -19,7 +18,7 @@
         "docker": "Monai.Deploy.WorkflowManager.TaskManager.Docker.DockerPlugin, Monai.Deploy.WorkflowManager.TaskManager.Docker"
       },
       "meta-data": {
-      }
+      },
     },
     "messaging": {
       "retries": {
@@ -35,10 +34,6 @@
         "dicomWebAgentName": "monaidicomweb",
         "scuAgentName": "monaiscu"
       },
-      "argoCallback": {
-        "argoRabbitOverrideEnabled": false,
-        "argoRabbitOverrideEndpoint": "localhost"
-      },
       "publisherServiceAssemblyName": "Monai.Deploy.Messaging.RabbitMQ.RabbitMQMessagePublisherService, Monai.Deploy.Messaging.RabbitMQ",
       "publisherSettings": {
         "endpoint": "rabbitmq",
@@ -77,7 +72,7 @@
       }
     }
   },
-  "Logging": {
+   "Logging": {
     "LogLevel": {
       "Default": "Information",
       "System": "Warning",

deploy/monai-deploy-express/configs/workflow-manager.json

@@ -1,11 +1,7 @@
 {
   "WorkloadManagerDatabase": {
     "ConnectionString": "mongodb://root:rootpassword@mongodb:27017",
-    "DatabaseName": "WorkloadManager",
-    "WorkflowCollectionName": "Workflows",
-    "WorkflowInstanceCollectionName": "WorkflowInstances",
-    "PayloadCollectionName": "Payloads",
-    "TaskDispatchEventCollectionName": "TaskDispatchEvents"
+    "DatabaseName": "WorkloadManager"
   },
   "MonaiDeployAuthentication": {
     "BypassAuthentication": true