Skip to content

Commit 725b0fa

Browse files
sandereggsanderegg
committed
pass all postgres ENVs to the services
1 parent 3fb8edd commit 725b0fa

File tree

1 file changed

+50
-109
lines changed

1 file changed

+50
-109
lines changed

‎services/docker-compose.yml‎

Lines changed: 50 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,25 @@ x-webserver-diagnostics: &webserver_diagnostics_environs
1818
DIAGNOSTICS_MAX_TASK_DELAY: ${DIAGNOSTICS_MAX_TASK_DELAY}
1919
DIAGNOSTICS_SLOW_DURATION_SECS: ${DIAGNOSTICS_SLOW_DURATION_SECS}
2020

21-
21+
x-postgres-settings: &postgres_settings
22+
POSTGRES_DB: ${POSTGRES_DB}
23+
POSTGRES_HOST: ${POSTGRES_HOST}
24+
POSTGRES_MAXSIZE: ${POSTGRES_MAXSIZE}
25+
POSTGRES_MINSIZE: ${POSTGRES_MINSIZE}
26+
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
27+
POSTGRES_PORT: ${POSTGRES_PORT}
28+
POSTGRES_USER: ${POSTGRES_USER}
2229

2330
services:
2431
api-server:
2532
image: ${DOCKER_REGISTRY:-itisfoundation}/api-server:${DOCKER_IMAGE_TAG:-latest}
2633
init: true
2734
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
2835
environment: &api_server_environment
29-
<<: *tracing_open_telemetry_environs
36+
<<:
37+
- *tracing_open_telemetry_environs
38+
- *postgres_settings
39+
3040
API_SERVER_DEV_FEATURES_ENABLED: ${API_SERVER_DEV_FEATURES_ENABLED}
3141
API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
3242
API_SERVER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
@@ -40,12 +50,6 @@ services:
4050
DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
4151
DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
4252

43-
POSTGRES_DB: ${POSTGRES_DB}
44-
POSTGRES_HOST: ${POSTGRES_HOST}
45-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
46-
POSTGRES_PORT: ${POSTGRES_PORT}
47-
POSTGRES_USER: ${POSTGRES_USER}
48-
4953
RABBIT_HOST: ${RABBIT_HOST}
5054
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
5155
RABBIT_PORT: ${RABBIT_PORT}
@@ -184,7 +188,9 @@ services:
184188
init: true
185189
hostname: "cat-{{.Node.Hostname}}-{{.Task.Slot}}"
186190
environment:
187-
<<: *tracing_open_telemetry_environs
191+
<<:
192+
- *postgres_settings
193+
- *tracing_open_telemetry_environs
188194
CATALOG_BACKGROUND_TASK_REST_TIME: ${CATALOG_BACKGROUND_TASK_REST_TIME}
189195
CATALOG_DEV_FEATURES_ENABLED: ${CATALOG_DEV_FEATURES_ENABLED}
190196
CATALOG_LOGLEVEL: ${CATALOG_LOGLEVEL}
@@ -197,11 +203,7 @@ services:
197203
DIRECTOR_PORT: ${DIRECTOR_PORT:-8080}
198204
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
199205
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
200-
POSTGRES_DB: ${POSTGRES_DB}
201-
POSTGRES_HOST: ${POSTGRES_HOST}
202-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
203-
POSTGRES_PORT: ${POSTGRES_PORT}
204-
POSTGRES_USER: ${POSTGRES_USER}
206+
205207
RABBIT_HOST: ${RABBIT_HOST}
206208
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
207209
RABBIT_PORT: ${RABBIT_PORT}
@@ -284,7 +286,9 @@ services:
284286
init: true
285287
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
286288
environment:
287-
<<: *tracing_open_telemetry_environs
289+
<<:
290+
- *postgres_settings
291+
- *tracing_open_telemetry_environs
288292
DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY}
289293
DIRECTOR_DEFAULT_MAX_NANO_CPUS: ${DIRECTOR_DEFAULT_MAX_NANO_CPUS}
290294
DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS: ${DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS}
@@ -297,12 +301,6 @@ services:
297301
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS: ${DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS}
298302
DIRECTOR_TRACING: ${DIRECTOR_TRACING}
299303

300-
POSTGRES_DB: ${POSTGRES_DB}
301-
POSTGRES_HOST: ${POSTGRES_HOST}
302-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
303-
POSTGRES_PORT: ${POSTGRES_PORT}
304-
POSTGRES_USER: ${POSTGRES_USER}
305-
306304
REGISTRY_AUTH: ${REGISTRY_AUTH}
307305
REGISTRY_PATH: ${REGISTRY_PATH}
308306
REGISTRY_PW: ${REGISTRY_PW}
@@ -331,7 +329,9 @@ services:
331329
init: true
332330
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
333331
environment:
334-
<<: *tracing_open_telemetry_environs
332+
<<:
333+
- *postgres_settings
334+
- *tracing_open_telemetry_environs
335335
AWS_S3_CLI_S3: ${AWS_S3_CLI_S3}
336336

337337
CATALOG_HOST: ${CATALOG_HOST}
@@ -368,12 +368,6 @@ services:
368368
DIRECTOR_V2_LOGLEVEL: ${DIRECTOR_V2_LOGLEVEL}
369369
MONITORING_ENABLED: ${MONITORING_ENABLED}
370370

371-
POSTGRES_DB: ${POSTGRES_DB}
372-
POSTGRES_HOST: ${POSTGRES_HOST}
373-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
374-
POSTGRES_PORT: ${POSTGRES_PORT}
375-
POSTGRES_USER: ${POSTGRES_USER}
376-
377371
R_CLONE_OPTION_BUFFER_SIZE: ${R_CLONE_OPTION_BUFFER_SIZE}
378372
R_CLONE_OPTION_RETRIES: ${R_CLONE_OPTION_RETRIES}
379373
R_CLONE_OPTION_TRANSFERS: ${R_CLONE_OPTION_TRANSFERS}
@@ -445,7 +439,9 @@ services:
445439
networks:
446440
- default
447441
environment:
448-
<<: *tracing_open_telemetry_environs
442+
<<:
443+
- *postgres_settings
444+
- *tracing_open_telemetry_environs
449445
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
450446
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
451447
RABBIT_HOST: ${RABBIT_HOST}
@@ -458,11 +454,6 @@ services:
458454
REDIS_PORT: ${REDIS_PORT}
459455
REDIS_SECURE: ${REDIS_SECURE}
460456
REDIS_USER: ${REDIS_USER}
461-
POSTGRES_DB: ${POSTGRES_DB}
462-
POSTGRES_HOST: ${POSTGRES_HOST}
463-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
464-
POSTGRES_PORT: ${POSTGRES_PORT}
465-
POSTGRES_USER: ${POSTGRES_USER}
466457
SC_USER_ID: ${SC_USER_ID}
467458
SC_USER_NAME: ${SC_USER_NAME}
468459
EFS_USER_ID: ${EFS_USER_ID}
@@ -501,7 +492,9 @@ services:
501492
networks:
502493
- default
503494
environment:
504-
<<: *tracing_open_telemetry_environs
495+
<<:
496+
- *postgres_settings
497+
- *tracing_open_telemetry_environs
505498

506499
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
507500
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
@@ -522,11 +515,6 @@ services:
522515
PAYMENTS_SWAGGER_API_DOC_ENABLED: ${PAYMENTS_SWAGGER_API_DOC_ENABLED}
523516
PAYMENTS_TRACING: ${PAYMENTS_TRACING}
524517
PAYMENTS_USERNAME: ${PAYMENTS_USERNAME}
525-
POSTGRES_DB: ${POSTGRES_DB}
526-
POSTGRES_HOST: ${POSTGRES_HOST}
527-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
528-
POSTGRES_PORT: ${POSTGRES_PORT}
529-
POSTGRES_USER: ${POSTGRES_USER}
530518
RABBIT_HOST: ${RABBIT_HOST}
531519
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
532520
RABBIT_PORT: ${RABBIT_PORT}
@@ -548,16 +536,13 @@ services:
548536
networks:
549537
- default
550538
environment:
551-
<<: *tracing_open_telemetry_environs
539+
<<:
540+
- *postgres_settings
541+
- *tracing_open_telemetry_environs
552542

553543
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
554544
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
555-
POSTGRES_DB: ${POSTGRES_DB}
556-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
557-
POSTGRES_HOST: ${POSTGRES_HOST}
558-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
559-
POSTGRES_PORT: ${POSTGRES_PORT}
560-
POSTGRES_USER: ${POSTGRES_USER}
545+
561546
PROMETHEUS_URL: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_URL}
562547
PROMETHEUS_USERNAME: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_USERNAME}
563548
PROMETHEUS_PASSWORD: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_PASSWORD}
@@ -588,7 +573,9 @@ services:
588573
- default
589574
- docker-api-network
590575
environment:
591-
<<: *tracing_open_telemetry_environs
576+
<<:
577+
- *postgres_settings
578+
- *tracing_open_telemetry_environs
592579

593580
CATALOG_HOST: ${CATALOG_HOST}
594581
CATALOG_PORT: ${CATALOG_PORT}
@@ -612,12 +599,6 @@ services:
612599
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
613600
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
614601

615-
POSTGRES_DB: ${POSTGRES_DB}
616-
POSTGRES_HOST: ${POSTGRES_HOST}
617-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
618-
POSTGRES_PORT: ${POSTGRES_PORT}
619-
POSTGRES_USER: ${POSTGRES_USER}
620-
621602
RABBIT_HOST: ${RABBIT_HOST}
622603
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
623604
RABBIT_PORT: ${RABBIT_PORT}
@@ -706,6 +687,7 @@ services:
706687
hostname: "wb-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931
707688
environment: &webserver_environment
708689
<<:
690+
- *postgres_settings
709691
- *tracing_open_telemetry_environs
710692
- *webserver_diagnostics_environs
711693

@@ -746,16 +728,6 @@ services:
746728
# WEBSERVER_CREDIT_COMPUTATION
747729
WEBSERVER_CREDIT_COMPUTATION_ENABLED: ${WEBSERVER_CREDIT_COMPUTATION_ENABLED}
748730

749-
# WEBSERVER_DB
750-
POSTGRES_DB: ${POSTGRES_DB}
751-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
752-
POSTGRES_HOST: ${POSTGRES_HOST}
753-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
754-
POSTGRES_PORT: ${POSTGRES_PORT}
755-
POSTGRES_MINSIZE: ${POSTGRES_MINSIZE}
756-
POSTGRES_MAXSIZE: ${POSTGRES_MAXSIZE}
757-
POSTGRES_USER: ${POSTGRES_USER}
758-
759731
# WEBSERVER_DIAGNOSTICS
760732
WEBSERVER_DIAGNOSTICS: ${WEBSERVER_DIAGNOSTICS}
761733

@@ -966,6 +938,8 @@ services:
966938
init: true
967939
hostname: "db-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931
968940
environment:
941+
<<:
942+
- *postgres_settings
969943
WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL}
970944

971945
# NOTE: keep in sync with the prefix form the hostname
@@ -974,14 +948,6 @@ services:
974948
WEBSERVER_HOST: ${WEBSERVER_HOST}
975949
WEBSERVER_PORT: ${WEBSERVER_PORT}
976950

977-
# WEBSERVER_DB
978-
POSTGRES_DB: ${POSTGRES_DB}
979-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
980-
POSTGRES_HOST: ${POSTGRES_HOST}
981-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
982-
POSTGRES_PORT: ${POSTGRES_PORT}
983-
POSTGRES_USER: ${POSTGRES_USER}
984-
985951
DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
986952
DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
987953

@@ -1057,6 +1023,7 @@ services:
10571023
hostname: "gc-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931
10581024
environment:
10591025
<<:
1026+
- *postgres_settings
10601027
- *tracing_open_telemetry_environs
10611028

10621029
# WEBSERVER_DIRECTOR_V2
@@ -1071,13 +1038,8 @@ services:
10711038
# NOTE: keep in sync with the prefix form the hostname
10721039
LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: gc
10731040

1074-
# WEBSERVER_DB
1075-
POSTGRES_DB: ${POSTGRES_DB}
1076-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1077-
POSTGRES_HOST: ${POSTGRES_HOST}
1078-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1079-
POSTGRES_PORT: ${POSTGRES_PORT}
1080-
POSTGRES_USER: ${POSTGRES_USER}
1041+
1042+
10811043

10821044
# WEBSERVER_RABBITMQ
10831045
RABBIT_HOST: ${RABBIT_HOST}
@@ -1157,8 +1119,9 @@ services:
11571119
hostname: "auth-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931
11581120
environment:
11591121
<<:
1160-
- *webserver_diagnostics_environs
1122+
- *postgres_settings
11611123
- *tracing_open_telemetry_environs
1124+
- *webserver_diagnostics_environs
11621125

11631126
APP_NAME: "simcore_service_wb_auth"
11641127
WEBSERVER_APP_FACTORY_NAME: WEBSERVER_AUTHZ_APP_FACTORY
@@ -1169,13 +1132,6 @@ services:
11691132

11701133
GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
11711134

1172-
# WEBSERVER_DB
1173-
POSTGRES_DB: ${POSTGRES_DB}
1174-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1175-
POSTGRES_HOST: ${POSTGRES_HOST}
1176-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1177-
POSTGRES_PORT: ${POSTGRES_PORT}
1178-
POSTGRES_USER: ${POSTGRES_USER}
11791135

11801136
# WEBSERVER_DIAGNOSTICS
11811137
WEBSERVER_DIAGNOSTICS: ${WB_AUTH_DIAGNOSTICS}
@@ -1271,27 +1227,21 @@ services:
12711227
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
12721228

12731229
environment:
1230+
<<:
1231+
- *postgres_settings
1232+
- *tracing_open_telemetry_environs
12741233
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
12751234
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
12761235

12771236
NOTIFICATIONS_LOGLEVEL: ${NOTIFICATIONS_LOGLEVEL}
12781237
NOTIFICATIONS_TRACING: ${NOTIFICATIONS_TRACING}
12791238

1280-
POSTGRES_DB: ${POSTGRES_DB}
1281-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1282-
POSTGRES_HOST: ${POSTGRES_HOST}
1283-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1284-
POSTGRES_PORT: ${POSTGRES_PORT}
1285-
POSTGRES_USER: ${POSTGRES_USER}
1286-
12871239
RABBIT_HOST: ${RABBIT_HOST}
12881240
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
12891241
RABBIT_PORT: ${RABBIT_PORT}
12901242
RABBIT_SECURE: ${RABBIT_SECURE}
12911243
RABBIT_USER: ${RABBIT_USER}
12921244

1293-
<<: *tracing_open_telemetry_environs
1294-
12951245
dask-sidecar:
12961246
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
12971247
init: true
@@ -1354,15 +1304,12 @@ services:
13541304
init: true
13551305
hostname: "sto-{{.Node.Hostname}}-{{.Task.Slot}}"
13561306
environment: &storage_environment
1307+
<<:
1308+
- *postgres_settings
1309+
- *tracing_open_telemetry_environs
13571310
DATCORE_ADAPTER_HOST: ${DATCORE_ADAPTER_HOST:-datcore-adapter}
13581311
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
13591312
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
1360-
POSTGRES_DB: ${POSTGRES_DB}
1361-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1362-
POSTGRES_HOST: ${POSTGRES_HOST}
1363-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1364-
POSTGRES_PORT: ${POSTGRES_PORT}
1365-
POSTGRES_USER: ${POSTGRES_USER}
13661313
RABBIT_HOST: ${RABBIT_HOST}
13671314
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
13681315
RABBIT_PORT: ${RABBIT_PORT}
@@ -1384,7 +1331,6 @@ services:
13841331
STORAGE_PROFILING: ${STORAGE_PROFILING}
13851332
STORAGE_PORT: ${STORAGE_PORT}
13861333
STORAGE_TRACING: ${STORAGE_TRACING}
1387-
<<: *tracing_open_telemetry_environs
13881334
networks: &storage_networks
13891335
- default
13901336
- interactive_services_subnet
@@ -1440,12 +1386,7 @@ services:
14401386
init: true
14411387
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
14421388
environment:
1443-
POSTGRES_DB: ${POSTGRES_DB}
1444-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1445-
POSTGRES_HOST: ${POSTGRES_HOST}
1446-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1447-
POSTGRES_PORT: ${POSTGRES_PORT}
1448-
POSTGRES_USER: ${POSTGRES_USER}
1389+
<<: *postgres_settings
14491390
networks:
14501391
- default # actually needed for the postgres service only
14511392

0 commit comments

Comments
 (0)