diff --git a/CHANGELOG.md b/CHANGELOG.md index 0010ef6b..2662de97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ and this project adheres to - πŸ›(frontend) fix dnd conflict with tree and Blocknote #1328 - πŸ›(frontend) fix display bug on homepage #1332 - πŸ›link role update #1287 +- πŸ”§(keycloak) Fix https required issue in dev mode #1286 ## [3.5.0] - 2025-07-31 diff --git a/compose.yml b/compose.yml index 88e178e3..a774f11e 100644 --- a/compose.yml +++ b/compose.yml @@ -184,22 +184,20 @@ services: - env.d/development/kc_postgresql.local keycloak: - image: quay.io/keycloak/keycloak:20.0.1 + image: quay.io/keycloak/keycloak:26.3 volumes: - ./docker/auth/realm.json:/opt/keycloak/data/import/realm.json command: - start-dev - --features=preview - --import-realm - - --proxy=edge - - --hostname-url=http://localhost:8083 - - --hostname-admin-url=http://localhost:8083/ + - --hostname=http://localhost:8083 - --hostname-strict=false - - --hostname-strict-https=false - --health-enabled=true - --metrics-enabled=true healthcheck: - test: ["CMD", "curl", "--head", "-fsS", "http://localhost:8080/health/ready"] + test: ['CMD-SHELL', 'exec 3<>/dev/tcp/localhost/9000; echo -e "GET /health/live HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n" >&3; grep "HTTP/1.1 200 OK" <&3'] + start_period: 5s interval: 1s timeout: 2s retries: 300 diff --git a/docker/auth/realm.json b/docker/auth/realm.json index db5f1be0..c5f265a4 100644 --- a/docker/auth/realm.json +++ b/docker/auth/realm.json @@ -26,7 +26,7 @@ "oauth2DeviceCodeLifespan": 600, "oauth2DevicePollingInterval": 5, "enabled": true, - "sslRequired": "external", + "sslRequired": "none", "registrationAllowed": true, "registrationEmailAsUsername": false, "rememberMe": true, @@ -2270,7 +2270,7 @@ "cibaInterval": "5", "realmReusableOtpCode": "false" }, - "keycloakVersion": "20.0.1", + "keycloakVersion": "26.3.2", "userManagedAccessAllowed": false, "clientProfiles": { "profiles": []