From 75f2f98fd95271190233de61a896b9ecc8dc0cf5 Mon Sep 17 00:00:00 2001 From: Rajdeep Singh Date: Sun, 12 Apr 2026 01:07:19 +0530 Subject: [PATCH] Fixes #26775: Use empty default for OIDC_CUSTOM_PARAMS to fix Compose brace-parsing --- docker/development/docker-compose-gcp.yml | 4 ++-- docker/development/docker-compose-postgres-fuseki.yml | 4 ++-- docker/development/docker-compose-postgres.yml | 4 ++-- docker/development/docker-compose.yml | 4 ++-- .../docker-compose-openmetadata.yml | 4 ++-- docker/docker-compose-quickstart/docker-compose-postgres.yml | 4 ++-- docker/docker-compose-quickstart/docker-compose-rdf.yml | 4 ++-- docker/docker-compose-quickstart/docker-compose.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/development/docker-compose-gcp.yml b/docker/development/docker-compose-gcp.yml index 392b51187a80..8673823418a0 100644 --- a/docker/development/docker-compose-gcp.yml +++ b/docker/development/docker-compose-gcp.yml @@ -119,7 +119,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_CUSTOM_PARAMS:-} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -333,7 +333,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_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/development/docker-compose-postgres-fuseki.yml b/docker/development/docker-compose-postgres-fuseki.yml index 0a40ad473ebf..bfdf5a0ef8aa 100644 --- a/docker/development/docker-compose-postgres-fuseki.yml +++ b/docker/development/docker-compose-postgres-fuseki.yml @@ -119,7 +119,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_CUSTOM_PARAMS:-} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -350,7 +350,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_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/development/docker-compose-postgres.yml b/docker/development/docker-compose-postgres.yml index 23fe5b6e6b22..adaa8573873d 100644 --- a/docker/development/docker-compose-postgres.yml +++ b/docker/development/docker-compose-postgres.yml @@ -118,7 +118,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_CUSTOM_PARAMS:-} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -345,7 +345,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_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/development/docker-compose.yml b/docker/development/docker-compose.yml index 1ae7722f224e..2e8e4ff201c3 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -115,7 +115,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_CUSTOM_PARAMS:-} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -338,7 +338,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_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-openmetadata/docker-compose-openmetadata.yml b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml index 82bd2fda554d..7f68e7a961bd 100644 --- a/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml +++ b/docker/docker-compose-openmetadata/docker-compose-openmetadata.yml @@ -60,7 +60,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_CUSTOM_PARAMS:-} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"} @@ -281,7 +281,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_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-postgres.yml b/docker/docker-compose-quickstart/docker-compose-postgres.yml index 8709585a7f40..c49e9d757b62 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_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_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-rdf.yml b/docker/docker-compose-quickstart/docker-compose-rdf.yml index 4b106eda07fc..cedcc1dde80a 100644 --- a/docker/docker-compose-quickstart/docker-compose-rdf.yml +++ b/docker/docker-compose-quickstart/docker-compose-rdf.yml @@ -148,7 +148,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_CUSTOM_PARAMS:-} # Database configuration for MySQL DB_DRIVER_CLASS: ${DB_DRIVER_CLASS:-com.mysql.cj.jdbc.Driver} @@ -318,7 +318,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_CUSTOM_PARAMS:-} # Database configuration for MySQL DB_DRIVER_CLASS: ${DB_DRIVER_CLASS:-com.mysql.cj.jdbc.Driver} diff --git a/docker/docker-compose-quickstart/docker-compose.yml b/docker/docker-compose-quickstart/docker-compose.yml index df24da9b31fe..f1b81c9a6ecb 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_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_CUSTOM_PARAMS:-} OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"} OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"} OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}