Skip to content

Commit

Permalink
chore(deps): updated keycloak from v15 to v21 (#111)
Browse files Browse the repository at this point in the history
  • Loading branch information
chgl authored May 1, 2023
1 parent 9e6d17b commit 2f98064
Show file tree
Hide file tree
Showing 11 changed files with 2,415 additions and 56 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
e2e-test-directory: "tests/e2e/"
- module: "notify"
e2e-test-directory: "tests/e2e/"
# Disabled temporarily
# - module: "list"
# e2e-test-directory: "frontend/tests/e2e/"
env:
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/observability.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ See [Kubernetes/Metrics](./kubernetes.md#metrics) for how to setup monitoring on

All modules support distributed tracing using OpenTelemetry.
See <https://github.com/opentracing-contrib/java-spring-jaeger> for the `notify` and `query` module configuration and <https://github.com/miracum/recruit/blob/master/src/list/server/config.js#L8>
and <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md>
and <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md>
for the list module setup.
2 changes: 2 additions & 0 deletions docs/development/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ This will start all development dependencies:
- HAPI FHIR JPA Server
- Jaeger
- MailDev
- Keycloak

If you want to start any of the recruIT modules as containers, you can specify the corresponding `--profile` switch.
For example, when working on the query module, it might be useful to run the screening list and the notify module
for debugging. The following will start all development dependencies as well as build and run the list and notify containers:

```sh
docker compose -f hack/docker-compose.yaml --profile=notify --profile=list build
docker compose -f hack/docker-compose.yaml --profile=notify --profile=list up
```

Expand Down
39 changes: 38 additions & 1 deletion src/hack/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,14 @@ services:
- ALL
read_only: true
privileged: false
extra_hosts:
- "host.docker.internal:host-gateway"
environment:
FHIR_URL: "http://fhir:8080/fhir"
KEYCLOAK_DISABLED: "true"
KEYCLOAK_DISABLED: "false"
KEYCLOAK_AUTH_URL: "http://host.docker.internal:8083/"
KEYCLOAK_CLIENT_ID: "recruit-list"
KEYCLOAK_REALM: "recruIT"
TRACING_ENABLED: "true"
OTEL_SERVICE_NAME: "list"
OTEL_EXPORTER_JAEGER_AGENT_HOST: "jaeger"
Expand Down Expand Up @@ -317,3 +322,35 @@ services:
POSTGRES_DB: recruit_notify_jobs
ports:
- "127.0.0.1:6432:5432"

keycloak:
image: quay.io/keycloak/keycloak:21.1.1@sha256:8ebb3930c41e8a066c4246eaf351ac09cdc984e11b1f607d6ff4ce10d69dc808
restart: unless-stopped
ipc: none
security_opt:
- "no-new-privileges:true"
cap_drop:
- ALL
privileged: false
deploy:
resources:
limits:
memory: 2048m
command:
- start-dev
- --import-realm
environment:
KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: admin
volumes:
- type: bind
source: ./keycloak/recruit-realm-export.json
target: /opt/keycloak/data/import/recruit-realm-export.json
read_only: true
ports:
- 8083:8080
labels:
- "traefik.enable=true"
- "traefik.http.services.keycloak.loadbalancer.server.port=8080"
- "traefik.http.routers.keycloak.rule=Host(`recruit-keycloak.127.0.0.1.nip.io`)"
- "traefik.http.routers.keycloak.entrypoints=web"
Loading

0 comments on commit 2f98064

Please # to comment.