Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
bcrickboom committed Nov 21, 2024
1 parent 02dcea7 commit c19a89b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 13 deletions.
18 changes: 12 additions & 6 deletions minimal-setup/keycloak/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,13 @@ Update these settings:

# Enabling API keys

If you wish to enable support for api-keys authentication, you should log in the Keycloak admin console and:
If you wish to enable support for api-keys authentication (which is mandatory for permissions management from UI),
you have to get the `KEYCLOAK_CLIENT_SECRET` value from the Keycloak logs (displayed only during the very first boot) and
put it into the `docker-compose.yml` file (`orthanc-auth-service` container). Then, restart the Docker setup: `docker compose up -d`.

Here is the old version of this:
<strike>
You should log in the Keycloak admin console and:
- in http://localhost/keycloak/admin/master/console/ (login/pwd: `admin`/`change-me`), left panel: Clients
- In the `orthanc` realm
- select `admin-cli`
Expand All @@ -83,22 +89,22 @@ If you wish to enable support for api-keys authentication, you should log in the
- `Service accounts roles` tab --> `Assign role` button
- **select `Filter by clients` in the combo box** and `view-users` in the search filter
- check `realm-management view-users` and click `Assign`
</strike>

Then, you should add an API-key to a user. Still in the Keycloak admin area:
Then, you can add an API-key to a user. Still in the Keycloak admin area:
- In the `orthanc` realm
- Open `Users` and select the `external` user
- In the `Attributes` tab, click `Add an attribute` and enter:
- `api-key` as the Key and `api-key-for-external-user-that-should-be-a-long-random-string` as the Value.
- Click `Save`

Then, in the `docker-compose.yml` uncomment the 2 lines related to these 2 env var:
- `ENABLE_KEYCLOAK_API_KEYS`
- `KEYCLOAK_CLIENT_SECRET`
Then, in the `docker-compose.yml` uncomment this line:
- `ENABLE_KEYCLOAK_API_KEYS: "true"`
- make sure that the Orthanc Authorization plugin contains this line:
`"TokenHttpHeaders" : [ "api-key" ],`

And restart the Docker setup:
- `docker compose up`
- `docker compose up -d`

Then, in a terminal, type this command to access the API with an api-key.

Expand Down
13 changes: 6 additions & 7 deletions minimal-setup/keycloak/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: "3"
services:

nginx:
image: orthancteam/orthanc-nginx:24.9.0
image: orthancteam/orthanc-nginx:24.11.0
depends_on: [orthanc, orthanc-auth-service, keycloak]
restart: unless-stopped
ports: ["80:80"]
Expand All @@ -24,8 +24,7 @@ services:
ENABLE_OHIF: "true"

orthanc:
#image: orthancteam/orthanc:24.8.3
image: orthancteam/orthanc-pre-release:master-unstable
#image: orthancteam/orthanc:24.10.3
volumes:
- orthanc-storage:/var/lib/orthanc/db
depends_on: [orthanc-db]
Expand Down Expand Up @@ -91,7 +90,7 @@ services:
}
orthanc-auth-service:
image: orthancteam/orthanc-auth-service:main
image: orthancteam/orthanc-auth-service:24.11.0
# always disable port mapping in production !!!
# ports: ["8000:8000"]
# permissions can be customized in the permissions.json file
Expand All @@ -109,8 +108,8 @@ services:
PUBLIC_ORTHANC_ROOT: "http://localhost/orthanc/"
PUBLIC_LANDING_ROOT: "http://localhost/orthanc/ui/app/token-landing.html"
# to use OHIF-plugin: make sure to use http://localhost/orthanc/ohif/
# PUBLIC_OHIF_ROOT: "http://localhost/ohif/"
PUBLIC_OHIF_ROOT: "http://localhost/orthanc/ohif/"
PUBLIC_OHIF_ROOT: "http://localhost/ohif/"
# PUBLIC_OHIF_ROOT: "http://localhost/orthanc/ohif/"
USERS: |
{
"share-user": "change-me"
Expand All @@ -133,7 +132,7 @@ services:


keycloak:
image: orthancteam/orthanc-keycloak:24.9.0
image: orthancteam/orthanc-keycloak:24.11.0
depends_on: [keycloak-db]
restart: unless-stopped
environment:
Expand Down
6 changes: 6 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ SPDX-FileCopyrightText: 2022 - 2024 Orthanc Team SRL <[email protected]>
SPDX-License-Identifier: GPL-3.0-or-later
-->

v 24.11.0
========

- Improved Keycloak image to automate its initial configuration.


v 24.9.1
========

Expand Down

0 comments on commit c19a89b

Please sign in to comment.