diff --git a/minimal-setup/keycloak-meddream-full/docker-compose.yml b/minimal-setup/keycloak-meddream-full/docker-compose.yml index aee2da0..28ac903 100644 --- a/minimal-setup/keycloak-meddream-full/docker-compose.yml +++ b/minimal-setup/keycloak-meddream-full/docker-compose.yml @@ -6,7 +6,7 @@ version: "3" services: nginx: - image: orthancteam/orthanc-nginx:23.11.0 + image: orthancteam/orthanc-nginx:24.1.0 depends_on: [orthanc, orthanc-auth-service, orthanc-for-api, meddream-viewer, keycloak] restart: unless-stopped ports: ["80:80"] @@ -24,7 +24,7 @@ services: ENABLE_ORTHANC_FOR_API: "true" orthanc: - image: osimis/orthanc:23.11.0 + image: osimis/orthanc:24.1.2 volumes: - orthanc-storage:/var/lib/orthanc/db depends_on: [orthanc-db] @@ -75,7 +75,7 @@ services: } orthanc-auth-service: - image: orthancteam/orthanc-auth-service:23.11.0 + image: orthancteam/orthanc-auth-service:24.1.0 depends_on: [keycloak, meddream-token-service] # permissions can be customized in the permissions.json file volumes: @@ -101,7 +101,7 @@ services: POSTGRES_HOST_AUTH_METHOD: "trust" keycloak: - image: orthancteam/orthanc-keycloak:23.11.0 + image: orthancteam/orthanc-keycloak:24.1.0 depends_on: [keycloak-db] restart: unless-stopped environment: @@ -124,11 +124,11 @@ services: POSTGRES_DB: "keycloak" meddream-token-service: - image: orthancteam/meddream-token-service:23.11.0 + image: orthancteam/meddream-token-service:24.1.0 restart: unless-stopped meddream-viewer: - image: orthancteam/meddream-viewer:23.11.0 + image: orthancteam/meddream-viewer:24.1.0 restart: unless-stopped depends_on: - orthanc-for-api @@ -140,12 +140,17 @@ services: ORTHANC_PWD: "change-me" ORTHANC_MEDDREAM_PYTHON_PLUGIN_ENABLED: "true" MEDDREAM_ADMIN_PASSWORD: "change-me" + MEDDREAM_PACS_CONFIG_TYPE: "Dicomweb" + #MEDDREAM_PACS_CONFIG_TYPE: "Orthanc" + ORTHANC_HOSTNAME: "orthanc-for-api" + ORTHANC_DICOM_PORT: 4242 + ORTHANC_AET: "ORTHANC" volumes: - meddream-license:/opt/meddream/license # An orthanc dedicated for API accesses and also used by MedDream orthanc-for-api: - image: osimis/orthanc:23.11.0 + image: osimis/orthanc:24.1.2 volumes: - orthanc-storage:/var/lib/orthanc/db - ./meddream-plugin.py:/scripts/meddream-plugin.py diff --git a/release-notes.md b/release-notes.md index a4bbb1e..caa65b9 100644 --- a/release-notes.md +++ b/release-notes.md @@ -4,6 +4,11 @@ SPDX-FileCopyrightText: 2022 - 2023 Orthanc Team SRL <info@orthanc.team> SPDX-License-Identifier: GPL-3.0-or-later --> +v 24.1.0 +======== + +- modified Meddream Docker image to allow DICOMweb for the connection with Orthanc + v 23.12.2 ======== diff --git a/sources/meddream/viewer/Dockerfile.meddream-viewer b/sources/meddream/viewer/Dockerfile.meddream-viewer index b47aed7..f9a2b4e 100644 --- a/sources/meddream/viewer/Dockerfile.meddream-viewer +++ b/sources/meddream/viewer/Dockerfile.meddream-viewer @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: CC0-1.0 -FROM meddream/orthanc-dicom-viewer:8.3.0 +FROM meddream/dicom-viewer:8.3.0 # you must define these environment variables: # TOKEN_SERVICE_ADDRESS @@ -10,6 +10,10 @@ FROM meddream/orthanc-dicom-viewer:8.3.0 # ORTHANC_USER # ORTHANC_PWD # ORTHANC_MEDDREAM_PYTHON_PLUGIN_ENABLED +# MEDDREAM_PACS_CONFIG_TYPE ('Orthanc' or 'Dicomweb') +# ORTHANC_HOSTNAME +# ORTHANC_DICOM_PORT +# ORTHANC_AET COPY --chown=meddream viewer.application.properties /opt/meddream/application.properties COPY --chown=meddream system.json /opt/meddream/sys/settings/system.json diff --git a/sources/meddream/viewer/system.json b/sources/meddream/viewer/system.json index f64460e..fe30f0d 100644 --- a/sources/meddream/viewer/system.json +++ b/sources/meddream/viewer/system.json @@ -31,7 +31,7 @@ "viewToClipboard": "IMAGE", "pngPSToClipboard": "NONE", "showCalculatedFps": true, - "viewToDICOM": false, + "viewToDICOM": true, "mistMpr3D": true, "clearCache": false, "measurementsPropagation": true, diff --git a/sources/meddream/viewer/viewer.application.properties b/sources/meddream/viewer/viewer.application.properties index d59cbda..8ebb6c4 100644 --- a/sources/meddream/viewer/viewer.application.properties +++ b/sources/meddream/viewer/viewer.application.properties @@ -11,7 +11,7 @@ com.softneta.license.licenseFileLocation=/opt/meddream/license spring.profiles.include=auth-inmemory,auth-his authentication.his.token-service-address=${TOKEN_SERVICE_ADDRESS} -com.softneta.meddream.pacs.configurations[0].type=Orthanc +com.softneta.meddream.pacs.configurations[0].type=${MEDDREAM_PACS_CONFIG_TYPE:Dicomweb} com.softneta.meddream.pacs.configurations[0].id=Orthanc com.softneta.meddream.pacs.configurations[0].baseUrl=${ORTHANC_BASE_URL} com.softneta.meddream.pacs.configurations[0].username=${ORTHANC_USER:orthanc} @@ -20,6 +20,17 @@ com.softneta.meddream.pacs.configurations[0].pythonPlugin=${ORTHANC_MEDDREAM_PYT com.softneta.meddream.pacs.configurations[0].searchApiEnabled=true com.softneta.meddream.pacs.configurations[0].imageApiEnabled=true +# this section is related to Dicomweb, MEDDREAM_PACS_CONFIG_TYPE should be set to 'Dicomweb' to use them +com.softneta.meddream.pacs.configurations[0].qidoRsUrl=${ORTHANC_BASE_URL}/dicom-web +com.softneta.meddream.pacs.configurations[0].wadoRsUrl=${ORTHANC_BASE_URL}/dicom-web +com.softneta.meddream.pacs.configurations[0].wadoUriUrl=${ORTHANC_BASE_URL}/wado +com.softneta.meddream.pacs.configurations[0].stowRsUrl=${ORTHANC_BASE_URL}/dicom-web +com.softneta.meddream.pacs.configurations[0].uploadUrl=${ORTHANC_BASE_URL}/dicom-web/studies/{study} + +# this section allows to push back Key objects to Orthanc +com.softneta.meddream.pacs.configurations[0].storeScpIp=${ORTHANC_HOSTNAME:orthanc} +com.softneta.meddream.pacs.configurations[0].storeScpPort=${ORTHANC_DICOM_PORT:4242} +com.softneta.meddream.pacs.configurations[0].storeScpAet=${ORTHANC_AET:ORTHANC} # at least one user is required to reach the registration web page and fill the licence key authentication.inmemory.users[0].userName=admin