From bde37e3465d281982fa5a8401190ffeead325b27 Mon Sep 17 00:00:00 2001
From: Alain Mazy <alain@mazy.be>
Date: Tue, 13 Feb 2024 11:09:41 +0100
Subject: [PATCH] versions in demo

---
 minimal-setup/basic-auth/docker-compose.yml         | 13 +++----------
 .../keycloak-meddream-full/docker-compose.yml       | 10 +++++-----
 minimal-setup/keycloak/docker-compose.yml           |  8 ++++----
 release-notes.md                                    |  8 +++++++-
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/minimal-setup/basic-auth/docker-compose.yml b/minimal-setup/basic-auth/docker-compose.yml
index 18b11b0..f638bad 100644
--- a/minimal-setup/basic-auth/docker-compose.yml
+++ b/minimal-setup/basic-auth/docker-compose.yml
@@ -6,7 +6,7 @@ version: "3"
 services:
 
   nginx:
-    image: orthancteam/orthanc-nginx:23.12.2
+    image: orthancteam/orthanc-nginx:24.2.0
     depends_on: [orthanc, orthanc-auth-service, orthanc-for-shares]
     restart: unless-stopped
     ports: ["80:80"]
@@ -105,7 +105,7 @@ services:
         }
 
   orthanc-auth-service:
-    image: orthancteam/orthanc-auth-service:23.12.2
+    image: orthancteam/orthanc-auth-service:24.2.0
     restart: unless-stopped
     environment:
       SECRET_KEY: "change-me-I-am-a-secret-key"
@@ -119,7 +119,7 @@ services:
         }
 
   ohif:
-    image: orthancteam/ohif-v3:23.11.0
+    image: orthancteam/ohif-v3:24.2.0
 #  uncomment if you want to customize ohif configuration
 #    volumes:
 #      - ./ohif-app-config.js:/usr/share/nginx/html/app-config.js
@@ -132,13 +132,6 @@ services:
     environment:
       POSTGRES_HOST_AUTH_METHOD: "trust"
 
-  ohif:
-    image: orthancteam/ohif-v3:23.12.2
-#  uncomment if you want to customize ohif configuration
-#    volumes:
-#      - ./ohif-app-config.js:/usr/share/nginx/html/app-config.js
-    restart: unless-stopped
-
 volumes:
   orthanc-storage:
   orthanc-db:
diff --git a/minimal-setup/keycloak-meddream-full/docker-compose.yml b/minimal-setup/keycloak-meddream-full/docker-compose.yml
index 752a356..4b92c6d 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:24.1.0
+    image: orthancteam/orthanc-nginx:24.2.0
     depends_on: [orthanc, orthanc-auth-service, orthanc-for-api, meddream-viewer, keycloak]
     restart: unless-stopped
     ports: ["80:80"]
@@ -75,7 +75,7 @@ services:
         }
 
   orthanc-auth-service:
-    image: orthancteam/orthanc-auth-service:24.1.0
+    image: orthancteam/orthanc-auth-service:24.2.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:24.1.0
+    image: orthancteam/orthanc-keycloak:24.2.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:24.1.0
+    image: orthancteam/meddream-token-service:24.2.0
     restart: unless-stopped
 
   meddream-viewer:
-    image: orthancteam/meddream-viewer:24.1.0
+    image: orthancteam/meddream-viewer:24.2.0
     restart: unless-stopped
     depends_on:
       - orthanc-for-api
diff --git a/minimal-setup/keycloak/docker-compose.yml b/minimal-setup/keycloak/docker-compose.yml
index c089298..abf83a1 100644
--- 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:23.12.2
+    image: orthancteam/orthanc-nginx:24.2.0
     depends_on: [orthanc, orthanc-auth-service, keycloak]
     restart: unless-stopped
     ports: ["80:80"]
@@ -77,7 +77,7 @@ services:
         }
 
   orthanc-auth-service:
-    image: orthancteam/orthanc-auth-service:api-keys
+    image: orthancteam/orthanc-auth-service:24.2.0
     # always disable port mapping in production !!!
     # ports: ["8000:8000"]
     # permissions can be customized in the permissions.json file
@@ -106,7 +106,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: "trust"
 
   ohif:
-    image: orthancteam/ohif-v3:23.12.2
+    image: orthancteam/ohif-v3:24.2.0
 #  uncomment if you want to customize ohif configuration
 #    volumes:
 #      - ./ohif-app-config.js:/usr/share/nginx/html/app-config.js
@@ -114,7 +114,7 @@ services:
 
 
   keycloak:
-    image: orthancteam/orthanc-keycloak:23.12.2
+    image: orthancteam/orthanc-keycloak:24.2.0
     depends_on: [keycloak-db]
     restart: unless-stopped
 #    healthcheck:
diff --git a/release-notes.md b/release-notes.md
index d34b58d..6604fb9 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -4,16 +4,22 @@ SPDX-FileCopyrightText: 2022 - 2024 Orthanc Team SRL <info@orthanc.team>
 SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
+v 24.2.0
+========
+
 - added support for Api-keys that can be defined as user custom attributes `api-key`
   in Keycloak.  This requires the definition of 3 new env vars: `ENABLE_KEYCLOAK_API_KEYS`,
   `KEYCLOAK_CLIENT_SECRET` and `KECLOAK_ADMIN_URI`.  This also requires you to configure
-  the `admin-cli` client in Keycloak.
+  the `admin-cli` client in Keycloak and add `api-key` in the `TokenHttpHeaders` Orthanc Authorization plugin configuration.
+  Check the readme.md from the minimal-setup/keycloak sample.
+
 
 v 24.1.1
 ========
 
 - made the basic auth mandatory for the auth service
 
+
 v 24.1.0
 ========