Merge pull request #689 from jbernal0019/master

Add oxidicom service

Author: jbernal0019

docker-compose.yml

@@ -157,12 +157,6 @@ services:
       - "8222:8222"
     networks:
       local:
-    healthcheck:
-      test: wget http://localhost:8222/healthz -q -S -O -
-      start_period: 20s
-      retries: 3
-      timeout: 10s
-      interval: 5s
 
   lldap:
     image: docker.io/nitnelave/lldap:stable
@@ -220,7 +214,6 @@ services:
     volumes:
       - pfdcm:/home/dicom:rw
       - ./pfdcm-services:/home/dicom/services:ro
-      - chris_files:/chris_files:rw
     ports:
       - "4005:4005"
     networks:
@@ -238,6 +231,37 @@ services:
     command: chown 1001 /home/dicom
     restart: "no"
 
+  oxidicom:
+    image: ghcr.io/fnndsc/oxidicom:3.0.0
+    environment:
+      # https://chrisproject.org/docs/oxidicom/deployment#environment-variables
+      OXIDICOM_FILES_ROOT: /data
+      OXIDICOM_AMQP_ADDRESS: amqp://queue:5672
+      OXIDICOM_NATS_ADDRESS: nats:4222
+      OXIDICOM_SCP_AET: ChRIS
+      OXIDICOM_SCP_PROMISCUOUS: "true"
+      OXIDICOM_LISTENER_THREADS: 32
+      OXIDICOM_LISTENER_PORT: 11111
+      RUST_LOG: oxidicom=info
+      OXIDICOM_PROGRESS_INTERVAL: 100ms
+      OXIDICOM_DEV_SLEEP: 150ms  # throttle performance, so that we can see what's going on in ChRIS_ui
+    ports:
+      - "11111:11111"
+    volumes:
+      - chris_files:/data:rw
+    networks:
+      - local
+    user: ${UID}:${GID}
+    stop_signal: SIGKILL
+    depends_on:
+      rabbitmq:
+        condition: service_started
+      nats:
+        condition: service_started
+      cube-nonroot-user-volume-fix:
+        condition: service_completed_successfully
+
+
 volumes:
   chris_files:
   db: