diff --git a/controlplane/package.json b/controlplane/package.json index 8c46080674..d17d2a18d8 100644 --- a/controlplane/package.json +++ b/controlplane/package.json @@ -52,7 +52,7 @@ "@graphql-eslint/eslint-plugin": "^3.20.1", "@graphql-inspector/core": "^6.2.1", "@graphql-tools/utils": "^11.0.0", - "@keycloak/keycloak-admin-client": "26.2.5", + "@keycloak/keycloak-admin-client": "26.5.4", "@octokit/webhooks-types": "^7.6.1", "@sentry/node": "^10.19.0", "@sentry/node-native": "^10.19.0", diff --git a/docker-compose.full.yml b/docker-compose.full.yml index 79aa0d8746..04f625291a 100644 --- a/docker-compose.full.yml +++ b/docker-compose.full.yml @@ -148,7 +148,7 @@ services: keycloak: image: ghcr.io/wundergraph/cosmo/keycloak:${DC_KEYCLOAK_VERSION:-latest} - command: ['start-dev', '--import-realm', '--optimized'] + command: ['start', '--import-realm', '--optimized'] environment: KC_HEALTH_ENABLED: 'true' KC_METRICS_ENABLED: 'true' @@ -159,6 +159,8 @@ services: KC_DB_URL_DATABASE: ${POSTGRES_DB_NAME:-keycloak} KC_DB_PASSWORD: ${POSTGRES_PASSWORD:-changeme} KC_DB_USERNAME: ${POSTGRES_USER:-postgres} + KC_HTTP_ENABLED: 'true' + KC_HOSTNAME_STRICT: 'false' ports: - '8080:8080' volumes: diff --git a/docker-compose.yml b/docker-compose.yml index cac97cfc83..17e8df0bff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: build: context: keycloak dockerfile: Dockerfile - command: ['start-dev', '--import-realm', '--optimized'] + command: ['start', '--import-realm', '--optimized'] environment: KC_HEALTH_ENABLED: 'true' KC_METRICS_ENABLED: 'true' @@ -34,6 +34,8 @@ services: KC_DB_URL_DATABASE: ${POSTGRES_DB_NAME:-keycloak} KC_DB_PASSWORD: ${POSTGRES_PASSWORD:-changeme} KC_DB_USERNAME: ${POSTGRES_USER:-postgres} + KC_HTTP_ENABLED: 'true' + KC_HOSTNAME_STRICT: 'false' ports: - '8080:8080' volumes: diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile index 6a0fcde476..b0971ebe3f 100644 --- a/keycloak/Dockerfile +++ b/keycloak/Dockerfile @@ -1,4 +1,4 @@ -ARG KEYCLOAK_VERSION=26.2.5 +ARG KEYCLOAK_VERSION=26.5.4 FROM --platform=${BUILDPLATFORM} timbru31/java-node:17-jdk-22 AS themebuilder diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 41666bb254..8a2684337b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -494,8 +494,8 @@ importers: specifier: ^11.0.0 version: 11.0.0(graphql@16.9.0(patch_hash=hafdlc54qtxpqvetpefk646rly)) '@keycloak/keycloak-admin-client': - specifier: 26.2.5 - version: 26.2.5 + specifier: 26.5.4 + version: 26.5.4 '@octokit/webhooks-types': specifier: ^7.6.1 version: 7.6.1 @@ -4136,8 +4136,8 @@ packages: '@jspm/core@2.0.1': resolution: {integrity: sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==} - '@keycloak/keycloak-admin-client@26.2.5': - resolution: {integrity: sha512-glMBjQE0M8KOe9uZtdIl7kvHeBjfegZKxK8SzAZxekWvwsZ3Kt+XNd1kKW7NUxRdrs9EGtJLNUWX8vfaR+0Snw==} + '@keycloak/keycloak-admin-client@26.5.4': + resolution: {integrity: sha512-pVhr35J11tvKf9rPJLNZbpNVzVk8Ri5HGi2QGEGw119bSHoriOjmovpd7tJ6+yiYTk0uHKGP9IcBZtq4oRqDUw==} engines: {node: '>=18'} '@lerna-lite/cli@4.1.1': @@ -14276,10 +14276,6 @@ packages: uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - url-join@5.0.0: - resolution: {integrity: sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} @@ -17982,10 +17978,9 @@ snapshots: '@jspm/core@2.0.1': {} - '@keycloak/keycloak-admin-client@26.2.5': + '@keycloak/keycloak-admin-client@26.5.4': dependencies: camelize-ts: 3.0.0 - url-join: 5.0.0 url-template: 3.1.1 '@lerna-lite/cli@4.1.1(@lerna-lite/publish@4.1.1(@types/node@22.17.0)(babel-plugin-macros@3.1.0)(conventional-commits-filter@5.0.0)(typescript@5.5.2))(@lerna-lite/version@4.1.1(@lerna-lite/publish@4.1.1(@types/node@22.17.0)(babel-plugin-macros@3.1.0)(conventional-commits-filter@5.0.0)(typescript@5.5.2))(@types/node@22.17.0)(babel-plugin-macros@3.1.0)(conventional-commits-filter@5.0.0)(typescript@5.5.2))(@types/node@22.17.0)(babel-plugin-macros@3.1.0)(typescript@5.5.2)': @@ -30260,8 +30255,6 @@ snapshots: dependencies: punycode: 2.3.1 - url-join@5.0.0: {} - url-parse@1.5.10: dependencies: querystringify: 2.2.0