Skip to content

Commit

Permalink
versions in demo
Browse files Browse the repository at this point in the history
  • Loading branch information
amazy committed Feb 13, 2024
1 parent e89acd2 commit bde37e3
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
13 changes: 3 additions & 10 deletions minimal-setup/basic-auth/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: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"]
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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:
10 changes: 5 additions & 5 deletions minimal-setup/keycloak-meddream-full/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.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"]
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 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:23.12.2
image: orthancteam/orthanc-nginx:24.2.0
depends_on: [orthanc, orthanc-auth-service, keycloak]
restart: unless-stopped
ports: ["80:80"]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -106,15 +106,15 @@ 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
restart: unless-stopped


keycloak:
image: orthancteam/orthanc-keycloak:23.12.2
image: orthancteam/orthanc-keycloak:24.2.0
depends_on: [keycloak-db]
restart: unless-stopped
# healthcheck:
Expand Down
8 changes: 7 additions & 1 deletion release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@ SPDX-FileCopyrightText: 2022 - 2024 Orthanc Team SRL <[email protected]>
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
========

Expand Down

0 comments on commit bde37e3

Please sign in to comment.