From 82f13ec4fe74a630d2deab979532dd607a6727e3 Mon Sep 17 00:00:00 2001 From: Harish Kotra Date: Tue, 14 Apr 2026 19:54:39 +0530 Subject: [PATCH 1/2] Fixes #26775: stabilize QuickStart OIDC_CUSTOM_PARAMS default --- docker/docker-compose-quickstart/docker-compose-postgres.yml | 4 ++-- docker/docker-compose-quickstart/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml index 8709585a7f40..b334d8eb3ab5 100644 --- a/docker/docker-compose-quickstart/docker-compose-postgres.yml +++ b/docker/docker-compose-quickstart/docker-compose-postgres.yml @@ -108,7 +108,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}} + OIDC_CUSTOM_PARAMS: "{}" OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -329,7 +329,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}} + OIDC_CUSTOM_PARAMS: "{}" OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml index df24da9b31fe..a71fe901418f 100644 --- a/docker/docker-compose-quickstart/docker-compose.yml +++ b/docker/docker-compose-quickstart/docker-compose.yml @@ -106,7 +106,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}} + OIDC_CUSTOM_PARAMS: "{}" OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -327,7 +327,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}} + OIDC_CUSTOM_PARAMS: "{}" OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} From b4fcac4441854873f936ece7409c6e5c5e37d0f9 Mon Sep 17 00:00:00 2001 From: Harish Kotra Date: Tue, 14 Apr 2026 20:02:07 +0530 Subject: [PATCH 2/2] Preserve OIDC_CUSTOM_PARAMS override with quoted default --- docker/docker-compose-quickstart/docker-compose-postgres.yml | 4 ++-- docker/docker-compose-quickstart/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose-quickstart/docker-compose-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml index b334d8eb3ab5..5c4ae8bf6422 100644 --- a/docker/docker-compose-quickstart/docker-compose-postgres.yml +++ b/docker/docker-compose-quickstart/docker-compose-postgres.yml @@ -108,7 +108,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: "{}" + OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-"{}"} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -329,7 +329,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: "{}" + OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-"{}"} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml index a71fe901418f..d872ec9922f9 100644 --- a/docker/docker-compose-quickstart/docker-compose.yml +++ b/docker/docker-compose-quickstart/docker-compose.yml @@ -106,7 +106,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: "{}" + OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-"{}"} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -327,7 +327,7 @@ services: OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"} OIDC_TENANT: ${OIDC_TENANT:-""} OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""} - OIDC_CUSTOM_PARAMS: "{}" + OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-"{}"} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}