Oxidicom version 2.0.0

FNNDSC/oxidicom#1

chrisomatic.yml

@@ -25,4 +25,3 @@ cube:
       version: 2.1.0
     - name: pl-unstack-folders
       version: 1.0.0
-    - name: dbg-nvidia-smi

docker-compose.yml

@@ -197,30 +197,25 @@ services:
       - pacs
 
   oxidicom:
-    image: ghcr.io/fnndsc/oxidicom:1.0.0-b.1
-    container_name: oxidicom
+    image: ghcr.io/fnndsc/oxidicom:2.0.0
     environment:
-      CHRIS_URL: http://chris:8000/api/v1/
-      CHRIS_USERNAME: chris
-      CHRIS_PASSWORD: chris1234
-      CHRIS_FILES_ROOT: /data
-      CHRIS_SCP_AET: ChRIS
-      CHRIS_PACS_ADDRESS: orthanc:4242
-      PORT: 11111
-      CHRIS_LISTENER_THREADS: 8
-      CHRIS_PUSHER_THREADS: 2
-      CHRIS_VERBOSE: "yes"
-      # OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector:4318"
-      # OTEL_RESOURCE_ATTRIBUTES: service.name=oxidicom-test
+      OXIDICOM_DB_CONNECTION: postgresql://chris:chris1234@db:5432/chris
+      OXIDICOM_FILES_ROOT: /data
+      OXIDICOM_SCP_AET: ChRIS
+      OXIDICOM_PACS_ADDRESS: '{MINICHRISORTHANC="orthanc:4242"}'
+      OXIDICOM_SCP_PROMISCUOUS: "true"
+      OXIDICOM_DB_BATCH_SIZE: 20
+      OXIDICOM_LISTENER_THREADS: 32
+      OXIDICOM_VERBOSE: "true"
+      OXIDICOM_LISTENER_PORT: 11111
     volumes:
       - chris_files:/data:rw
-    ports:
-      - "11111:11111"
     networks:
       - pacs
       - local
     profiles:
       - pacs
+    user: 1001:0
   pfbridge:
     image: docker.io/fnndsc/pfbridge:3.7.2
     container_name: pfbridge

scripts/clear_pacsfiles.sh

@@ -1,7 +1,12 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
 # Purpose: wipe pfdcm and CUBE pacsfiles
 
-docker compose down --timeout 1 pfdcm pfdcm-nonroot-user-volume-fix -v
+# change to directory where this script lives
+cd "$(dirname "$(readlink -f "$0")")"
+
+set -ex
+
+docker compose exec pfdcm sh -c 'rm -rf /home/dicom/log/seriesData/*'
 
 docker compose exec chris pip install tqdm
 docker compose exec chris python manage.py shell -c '
@@ -20,4 +25,3 @@ with tqdm(storage.ls("SERVICES/PACS")) as pbar:
         _ = storage.delete_obj(f)
 
 '
-docker compose up -d