Skip to content

Commit 67260f6

Browse files
RajdeepKushwaha5RajdeepKushwaha5
committed
Fixes #26775: Use empty default for OIDC_CUSTOM_PARAMS to fix Compose brace-parsing
1 parent 56dd723 commit 67260f6

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎docker/development/docker-compose-gcp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ services:
119119
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
120120
OIDC_TENANT: ${OIDC_TENANT:-""}
121121
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
122-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
122+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
123123
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
124124
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
125125
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -333,7 +333,7 @@ services:
333333
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
334334
OIDC_TENANT: ${OIDC_TENANT:-""}
335335
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
336-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
336+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
337337
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
338338
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
339339
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

‎docker/development/docker-compose-postgres-fuseki.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ services:
119119
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
120120
OIDC_TENANT: ${OIDC_TENANT:-""}
121121
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
122-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
122+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
123123
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
124124
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
125125
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -350,7 +350,7 @@ services:
350350
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
351351
OIDC_TENANT: ${OIDC_TENANT:-""}
352352
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
353-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
353+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
354354
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
355355
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
356356
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

‎docker/development/docker-compose-postgres.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ services:
118118
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
119119
OIDC_TENANT: ${OIDC_TENANT:-""}
120120
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
121-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
121+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
122122
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
123123
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
124124
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -345,7 +345,7 @@ services:
345345
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
346346
OIDC_TENANT: ${OIDC_TENANT:-""}
347347
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
348-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
348+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
349349
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
350350
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
351351
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

‎docker/development/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ services:
115115
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
116116
OIDC_TENANT: ${OIDC_TENANT:-""}
117117
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
118-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
118+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
119119
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
120120
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
121121
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -338,7 +338,7 @@ services:
338338
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
339339
OIDC_TENANT: ${OIDC_TENANT:-""}
340340
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
341-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
341+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
342342
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
343343
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
344344
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

‎docker/docker-compose-openmetadata/docker-compose-openmetadata.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ services:
6060
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
6161
OIDC_TENANT: ${OIDC_TENANT:-""}
6262
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
63-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
63+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
6464
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
6565
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
6666
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -281,7 +281,7 @@ services:
281281
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
282282
OIDC_TENANT: ${OIDC_TENANT:-""}
283283
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
284-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
284+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
285285
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
286286
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
287287
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

‎docker/docker-compose-quickstart/docker-compose-postgres.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ services:
108108
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
109109
OIDC_TENANT: ${OIDC_TENANT:-""}
110110
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
111-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
111+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
112112
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
113113
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
114114
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -329,7 +329,7 @@ services:
329329
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
330330
OIDC_TENANT: ${OIDC_TENANT:-""}
331331
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
332-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
332+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
333333
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
334334
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
335335
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

‎docker/docker-compose-quickstart/docker-compose-rdf.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ services:
148148
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
149149
OIDC_TENANT: ${OIDC_TENANT:-""}
150150
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
151-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
151+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
152152

153153
# Database configuration for MySQL
154154
DB_DRIVER_CLASS: ${DB_DRIVER_CLASS:-com.mysql.cj.jdbc.Driver}
@@ -318,7 +318,7 @@ services:
318318
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
319319
OIDC_TENANT: ${OIDC_TENANT:-""}
320320
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
321-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
321+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
322322

323323
# Database configuration for MySQL
324324
DB_DRIVER_CLASS: ${DB_DRIVER_CLASS:-com.mysql.cj.jdbc.Driver}

‎docker/docker-compose-quickstart/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ services:
106106
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
107107
OIDC_TENANT: ${OIDC_TENANT:-""}
108108
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
109-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
109+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
110110
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
111111
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
112112
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}
@@ -327,7 +327,7 @@ services:
327327
OIDC_CLIENT_AUTH_METHOD: ${OIDC_CLIENT_AUTH_METHOD:-"client_secret_post"}
328328
OIDC_TENANT: ${OIDC_TENANT:-""}
329329
OIDC_MAX_CLOCK_SKEW: ${OIDC_MAX_CLOCK_SKEW:-""}
330-
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-{}}
330+
OIDC_CUSTOM_PARAMS: ${OIDC_CUSTOM_PARAMS:-}
331331
OIDC_MAX_AGE: ${OIDC_MAX_AGE:-"0"}
332332
OIDC_PROMPT_TYPE: ${OIDC_PROMPT_TYPE:-"consent"}
333333
OIDC_SESSION_EXPIRY: ${OIDC_SESSION_EXPIRY:-"604800"}

0 commit comments

Comments
 (0)