Skip to content

Commit 91faf70

Browse files
amazyamazy
committed
Merge branch 'main' of github.com:orthanc-team/orthanc-auth-service
2 parents 2019c76 + afb21a0 commit 91faf70

File tree

7 files changed

+91
-36
lines changed

7 files changed

+91
-36
lines changed

‎minimal-setup/keycloak-meddream-full/docker-compose.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: "3"
66
services:
77

88
nginx:
9-
image: orthancteam/orthanc-nginx:25.8.1
9+
image: orthancteam/orthanc-nginx:26.2.0
1010
depends_on: [orthanc, orthanc-auth-service, orthanc-for-api, meddream-viewer, keycloak]
1111
restart: unless-stopped
1212
ports: ["80:80"]
@@ -24,7 +24,7 @@ services:
2424
ENABLE_ORTHANC_FOR_API: "true"
2525

2626
orthanc:
27-
image: orthancteam/orthanc:25.8.2
27+
image: orthancteam/orthanc:26.1.0
2828
volumes:
2929
- orthanc-storage:/var/lib/orthanc/db
3030
depends_on: [orthanc-db]
@@ -76,7 +76,7 @@ services:
7676
}
7777
7878
orthanc-auth-service:
79-
image: orthancteam/orthanc-auth-service:25.8.1
79+
image: orthancteam/orthanc-auth-service:26.2.0
8080
depends_on: [keycloak, meddream-token-service]
8181
# permissions can be customized in the permissions.json file
8282
volumes:
@@ -104,7 +104,7 @@ services:
104104
POSTGRES_HOST_AUTH_METHOD: "trust"
105105

106106
keycloak:
107-
image: orthancteam/orthanc-keycloak:25.8.1
107+
image: orthancteam/orthanc-keycloak:26.2.0
108108
depends_on: [keycloak-db]
109109
restart: unless-stopped
110110
environment:
@@ -126,11 +126,11 @@ services:
126126
POSTGRES_DB: "keycloak"
127127

128128
meddream-token-service:
129-
image: orthancteam/meddream-token-service:25.8.1
129+
image: orthancteam/meddream-token-service:26.2.0
130130
restart: unless-stopped
131131

132132
meddream-viewer:
133-
image: orthancteam/meddream-viewer:25.8.1
133+
image: orthancteam/meddream-viewer:26.2.0
134134
restart: unless-stopped
135135
depends_on:
136136
- orthanc-for-api
@@ -152,7 +152,7 @@ services:
152152

153153
# An orthanc dedicated for API accesses and also used by MedDream
154154
orthanc-for-api:
155-
image: orthancteam/orthanc:25.8.2
155+
image: orthancteam/orthanc:26.1.0
156156
volumes:
157157
- orthanc-storage:/var/lib/orthanc/db
158158
- ./meddream-plugin.py:/scripts/meddream-plugin.py

‎minimal-setup/keycloak/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: "3"
66
services:
77

88
nginx:
9-
image: orthancteam/orthanc-nginx:25.12.0
9+
image: orthancteam/orthanc-nginx:26.2.0
1010
depends_on: [orthanc, orthanc-auth-service, keycloak]
1111
restart: unless-stopped
1212
ports: ["80:80"]
@@ -168,7 +168,7 @@ services:
168168

169169

170170
keycloak:
171-
image: orthancteam/orthanc-keycloak:25.12.0
171+
image: orthancteam/orthanc-keycloak:26.2.0
172172
depends_on: [keycloak-db]
173173
restart: unless-stopped
174174
environment:

‎release-notes.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ Pending changes
1212
- Updated python to 3.14 and updated all python modules
1313
- The minimal keycloak setup now features a mock STMP server.
1414

15+
v 26.2.0
16+
========
17+
- Upgraded `Meddream` Docker base image from `8.4.0` to `8.8.0`
18+
- Upgraded `Nginx` Docker base image from `1.27.4` to `1.29.5`
1519

1620

1721
v 25.12.0
@@ -20,6 +24,7 @@ v 25.12.0
2024
- Modified Nginx docker images to avoid the buffering of requests body (removed rewrite directive).
2125
- Added `worklists` in the `UserPermissions` model
2226

27+
2328
v 25.9.0
2429
========
2530
- Update cache cleaner values for the Meddream viewer (according to Softneta recommendations)

‎sources/meddream/token-service/Dockerfile.meddream-token-service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: CC0-1.0
44

5-
FROM meddream/token-service:2.1.6
5+
FROM meddream/token-service:2.1.17
66

77
# optional env var
88
# MEDDREAM_TOKEN_USER

‎sources/meddream/viewer/Dockerfile.meddream-viewer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: CC0-1.0
44

5-
FROM meddream/dicom-viewer:8.4.0
5+
FROM meddream/dicom-viewer:8.8.0
66

77
# you must define these environment variables:
88
# TOKEN_SERVICE_ADDRESS

‎sources/meddream/viewer/system.json‎

Lines changed: 74 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
"searchSettings": true,
99
"viewerSettings": true,
1010
"reportSettings": true,
11+
"panelToolbarSettings": true,
1112
"hangingProtocolsSettings": true,
1213
"export": true,
1314
"archive": true,
1415
"search": true,
1516
"reports": true,
1617
"remoteReports": false,
1718
"liveShare": false,
18-
"hangingProtocols": "V1",
19+
"allowCopyMeasurementValue": true,
20+
"hangingProtocols": "V2",
1921
"openTabsTrackingMethod": "NONE",
2022
"batchImageRequests": true,
2123
"prepareInstances": false,
@@ -27,21 +29,34 @@
2729
"NM"
2830
],
2931
"preloadSeries": "OFF",
32+
"preloadAllFrames": false,
3033
"boundingBoxAnnotations": true,
3134
"viewToClipboard": "IMAGE",
3235
"pngPSToClipboard": "NONE",
33-
"showCalculatedFps": true,
3436
"viewToDICOM": true,
3537
"mistMpr3D": true,
3638
"clearCache": false,
3739
"measurementsPropagation": true,
38-
"overlay":true,
40+
"callCachedMetadata": true,
41+
"overlay": true,
3942
"digitalSubtraction": "NONE",
40-
"returnMinMaxPerFrame":true,
41-
"cad":true,
42-
"summaryThumbnailsForSopClasses":[]
43+
"returnMinMaxPerFrame": true,
44+
"cad": true,
45+
"checkKOPRPermissions": false,
46+
"playVideoInVideoTag": false,
47+
"browserExtensionIntegration": false,
48+
"hangingProtocolsQuickSave": true,
49+
"quadrantZoomEnabled": false,
50+
"workspace": {
51+
"allowWorkspaceSaving": true
52+
},
53+
"uploadDicomToPacs": false,
54+
"autoAdjustImageRotation": true
4355
},
44-
"blackListedSopClasses": [],
56+
"blackListedSopClasses": [
57+
"1.2.840.10008.5.1.4.1.1.66",
58+
"1.2.840.10008.5.1.4.1.1.4.2"
59+
],
4560
"forwardPacs": [
4661
{
4762
"storeScpIp": "127.0.0.1",
@@ -51,13 +66,22 @@
5166
}
5267
],
5368
"languages": [
54-
"en"
69+
"lt",
70+
"en",
71+
"ru",
72+
"de",
73+
"fr",
74+
"es",
75+
"it"
5576
],
5677
"dicomLibraryConfiguration": {
5778
"dicomLibrarySender": "someone@mail.com",
5879
"dicomLibrarySubject": "My special study",
59-
"languages": null,
60-
"language": null
80+
"languages": [
81+
"en",
82+
"de"
83+
],
84+
"language": "en"
6185
},
6286
"formatIntegrationLinkInViewer": false,
6387
"textureInterpolationType": 1,
@@ -70,12 +94,18 @@
7094
},
7195
"workersConfig": {
7296
"maxWorkers": "50%",
73-
"maxSegmentationWorkers": "50%"
97+
"maxSegmentationWorkers": "50%",
98+
"maxMeasurementWorkers": "50%",
99+
"maxJphWorkers": "0%"
74100
},
75101
"cacheSupervisorConfig": {
76-
"enabled": false,
102+
"enabled": true,
77103
"runFrequencyInSec": 10
78104
},
105+
"structureListenerConfig": {
106+
"enabled": false,
107+
"runFrequencyInSec": 30
108+
},
79109
"scrollingConfig": {
80110
"modality": [
81111
"CT",
@@ -88,27 +118,37 @@
88118
],
89119
"sopClass": []
90120
},
121+
"notificationsConfiguration": {
122+
"autoCloseAfterSec": 10
123+
},
124+
"personNameConfiguration": {
125+
"formatIn": "",
126+
"formatOut": null
127+
},
128+
"searchHistoryByPatientId": true,
129+
"dontAutoOpenTheseAnnotations": [
130+
"Lunit"
131+
],
91132
"fusionConfig": {
92133
"modality": [
93134
"CT",
94135
"MR",
95136
"PT"
96137
],
97138
"sopClass": [],
98-
"ignoreMissingSliceThickness":false
139+
"ignoreMissingSliceThickness": false
99140
},
100-
"notificationsConfig": {
101-
"autoCloseAfterSec": 10
102-
},
103-
"personNameConfiguration": {
104-
"formatIn": null,
105-
"formatOut": null
106-
},
107-
"searchHistoryByPatientId": true,
108-
"segmentationConfig": {
141+
"segmentationConfig": {
109142
"smartPaintPreloadOptions": "wait-for-toolbar",
110143
"messagingLevel": "minimal"
111144
},
145+
"windowPosition": [
146+
{
147+
"name": "patient-history",
148+
"width": 1245,
149+
"height": 800
150+
}
151+
],
112152
"instancesProgressivePreloadConfig": {
113153
"preloadCount":10,
114154
"supportedModalities": [
@@ -120,6 +160,16 @@
120160
"supportedSOPClasses":[],
121161
"enableSeriesManualPreload":true
122162
},
123-
"dontAutoOpenTheseAnnotations": [],
124-
"windowPosition": []
163+
"mistMprConfig": {
164+
"modalities": [
165+
"CT",
166+
"MR",
167+
"PT",
168+
"NM"
169+
],
170+
"sopClasses": []
171+
},
172+
"dentalConfig": {
173+
"dentalAPIUrl": "lib/3rdparty/dental"
174+
}
125175
}

‎sources/nginx/Dockerfile.orthanc-nginx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: CC0-1.0
44

5-
FROM nginx:1.27.4
5+
FROM nginx:1.29.5
66

77
RUN mkdir /etc/nginx/enabled-reverse-proxies
88
RUN mkdir /scripts

0 commit comments

Comments
 (0)