From 20e4321284a1cda8b5e3f091866ea21bb714b205 Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com> Date: Mon, 10 Feb 2025 12:32:12 +0100 Subject: [PATCH] [ACS-9181] Bump Keycloak to 26.1.0 on ACS 7.4.N (#3175) --- .../src/test/resources/alfresco-global.properties | 2 +- scripts/ci/docker-compose/docker-compose.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repository/src/test/resources/alfresco-global.properties b/repository/src/test/resources/alfresco-global.properties index 2aa3bbaeab..76a421e2ed 100644 --- a/repository/src/test/resources/alfresco-global.properties +++ b/repository/src/test/resources/alfresco-global.properties @@ -43,7 +43,7 @@ identity-service.enable-pkce=true identity-service.ignore-oauth-query-parameter=true identity-service.credentials.secret=11111 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=false diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index fbe0b4b236..bb5fc7b872 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -59,13 +59,13 @@ 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.1.0 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 ports: - - 8999:8080 \ No newline at end of file + - 8999:8080