switch to permissions-ui images on minimal setup

orthanc-team · Jun 25, 2024 · a863343 · a863343
1 parent 8b58f8d
commit a863343
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 22 deletions.
diff --git a/minimal-setup/keycloak/docker-compose.yml b/minimal-setup/keycloak/docker-compose.yml
@@ -6,7 +6,7 @@ version: "3"
 services:
 
   nginx:
-    image: orthancteam/orthanc-nginx:24.5.1
+    image: orthancteam/orthanc-nginx:permissions-ui
     depends_on: [orthanc, orthanc-auth-service, keycloak]
     restart: unless-stopped
     ports: ["80:80"]
@@ -25,8 +25,8 @@ services:
 
   orthanc:
 # to use OHIF-plugin:  use the master-unstable image
-#    image: orthancteam/orthanc-pre-release:master-unstable
-    image: orthancteam/orthanc:24.5.1
+    image: orthancteam/orthanc-pre-release:permissions-ui
+#    image: orthancteam/orthanc:24.5.1
     volumes:
       - orthanc-storage:/var/lib/orthanc/db
     depends_on: [orthanc-db]
@@ -92,7 +92,7 @@ services:
         }
 
   orthanc-auth-service:
-    image: orthancteam/orthanc-auth-service:24.5.1
+    image: orthancteam/orthanc-auth-service:permissions-ui
     # always disable port mapping in production !!!
     # ports: ["8000:8000"]
     # permissions can be customized in the permissions.json file
@@ -132,7 +132,7 @@ services:
 
 
   keycloak:
-    image: orthancteam/orthanc-keycloak:24.5.1
+    image: orthancteam/orthanc-keycloak:permissions-ui
     depends_on: [keycloak-db]
     restart: unless-stopped
 #    healthcheck:

diff --git a/minimal-setup/keycloak/permissions.jsonc b/minimal-setup/keycloak/permissions.jsonc
@@ -1,18 +1,36 @@
-// "SPDX-FileCopyrightText: 2022 - 2024 Orthanc Team SRL <[email protected]>"
-// SPDX-License-Identifier: CC0-1.0
-{
-  "roles" : {
-    "admin-role": {
-      "permissions": ["all", "admin-permissions"],
-      "authorized_labels": ["*"]
-    },
-    "doctor-role": {
-      "permissions":["view", "download", "share", "send"],
-      "authorized_labels": ["*"]
-    },
-    "external-role": {
-      "permissions":["view", "download"],
-      "authorized_labels": ["external"]
-    }
-  }
+// "SPDX-FileCopyrightText: 2022 - 2024 Orthanc Team SRL <[email protected]>"
+// SPDX-License-Identifier: CC0-1.0
+{
+  "roles": {
+    "admin-role": {
+      "authorized-labels": [
+        "*"
+      ],
+      "permissions": [
+        "all",
+        "admin-permissions"
+      ]
+    },
+    "doctor-role": {
+      "authorized-labels": [
+        "*"
+      ],
+      "permissions": [
+        "view",
+        "download",
+        "share",
+        "send"
+      ]
+    },
+    "external-role": {
+      "authorized-labels": [
+        "external"
+      ],
+      "permissions": [
+        "view",
+        "download"
+      ]
+    }
+  },
+  "available-labels": []
 }