Skip to content

Commit c0ece40

Browse files
authored
Devops/update keycloak (#1591)
Updates keycloak to a version that continuous to run in gh actions (weird, but not gonna worry about it as we *should* keep that up to date.
1 parent 0a851a7 commit c0ece40

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
{ printf 'HEAD /auth/health/ready HTTP/1.0\r\n\r\n' >&0; grep 'HTTP/1.0 200'; } 0<>/dev/tcp/localhost/9000

cwms-data-api/logging.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/cwms-data].handl
6767

6868
fixtures.level=FINE
6969
cwms.cda.datasource.level=FINE
70-
org.apache.level=FINE
70+
org.apache.level=ERROR
71+
org.apache.tomcat.jdbc.pool.level=INFO
7172
org.apache.catalina.realm.level=INFO
7273
org.apache.catalina.realm.useParentHandlers=true
7374
org.apache.catalina.authenticator.level=INFO

cwms-data-api/src/test/resources/tomcat/conf/context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
testWhileIdle="true"
1717
timeBetweenEvictionRunsMillis="5000"
1818
logValidationErrors="true"
19-
suspectTimeout="15"
19+
suspectTimeout="8"
2020
jdbcInterceptors="QueryTimeoutInterceptor(queryTimeout=600);StatementFinalizer(trace=true);StatementCache(callable=true);SlowQueryReport(threshold=5000);ResetAbandonedTimer"
2121
logAbandoned="true"
2222
maxAge="3600000"

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ services:
109109

110110
auth:
111111
image: quay.io/keycloak/keycloak:26.5
112-
command: ["start-dev","--import-realm"]
112+
command: ["start-dev", "--import-realm"]
113113
healthcheck:
114-
test: "/usr/bin/curl -If localhost:${APP_PORT:-8081}/auth/health/ready || exit 1"
114+
test: "/healthcheck.sh"
115115
interval: 5s
116116
timeout: 1s
117117
retries: 100

0 commit comments

Comments
 (0)