From 6e435e1a8cd78fb411fe8de691bc00e58b086df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Thu, 12 Dec 2024 10:46:48 +0100 Subject: [PATCH] ACS-9047 Use Keycloak 26 (#3079) --- repository/src/test/resources/alfresco-global.properties | 2 +- scripts/ci/docker-compose/docker-compose.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repository/src/test/resources/alfresco-global.properties b/repository/src/test/resources/alfresco-global.properties index 7aa761cf7b..20f5389408 100644 --- a/repository/src/test/resources/alfresco-global.properties +++ b/repository/src/test/resources/alfresco-global.properties @@ -36,7 +36,7 @@ identity-service.enable-pkce=true identity-service.ignore-oauth-query-parameter=true identity-service.credentials.secret= identity-service.credentials.provider=secret -identity-service.client-socket-timeout=1000 +identity-service.client-socket-timeout=3000 identity-service.client-connection-timeout=3000 identity-service.authentication.enable-username-password-authentication=true diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index 752ec2ee25..4d070e8ba7 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -59,11 +59,11 @@ services: CLIENT_SSL_TRUST_STORE_TYPE: "JCEKS" keycloak: profiles: ["with-sso"] - image: quay.io/keycloak/keycloak:25.0.6 + image: quay.io/keycloak/keycloak:26.0.7 environment: - - KEYCLOAK_ADMIN=admin - - KEYCLOAK_ADMIN_PASSWORD=admin - - KC_DB=dev-mem + - KC_BOOTSTRAP_ADMIN_USERNAME=admin + - KC_BOOTSTRAP_ADMIN_PASSWORD=admin + - KC_DB=dev-file command: ["start-dev", "--import-realm", "--http-relative-path=/auth", "--hostname=localhost", "--http-enabled=true"] volumes: - ../../../repository/src/test/resources/realms/alfresco-realm.json:/opt/keycloak/data/import/alfresco-realm.json