Skip to content

Commit 6b0910e

Browse files
sandereggsanderegg
committed
pass all postgres ENVs to the services
1 parent a58201f commit 6b0910e

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}
@@ -185,7 +189,9 @@ services:
185189
init: true
186190
hostname: "cat-{{.Node.Hostname}}-{{.Task.Slot}}"
187191
environment:
188-
<<: *tracing_open_telemetry_environs
192+
<<:
193+
- *postgres_settings
194+
- *tracing_open_telemetry_environs
189195
CATALOG_BACKGROUND_TASK_REST_TIME: ${CATALOG_BACKGROUND_TASK_REST_TIME}
190196
CATALOG_DEV_FEATURES_ENABLED: ${CATALOG_DEV_FEATURES_ENABLED}
191197
CATALOG_LOGLEVEL: ${CATALOG_LOGLEVEL}
@@ -198,11 +204,7 @@ services:
198204
DIRECTOR_PORT: ${DIRECTOR_PORT:-8080}
199205
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
200206
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
201-
POSTGRES_DB: ${POSTGRES_DB}
202-
POSTGRES_HOST: ${POSTGRES_HOST}
203-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
204-
POSTGRES_PORT: ${POSTGRES_PORT}
205-
POSTGRES_USER: ${POSTGRES_USER}
207+
206208
RABBIT_HOST: ${RABBIT_HOST}
207209
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
208210
RABBIT_PORT: ${RABBIT_PORT}
@@ -286,7 +288,9 @@ services:
286288
init: true
287289
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
288290
environment:
289-
<<: *tracing_open_telemetry_environs
291+
<<:
292+
- *postgres_settings
293+
- *tracing_open_telemetry_environs
290294
DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY}
291295
DIRECTOR_DEFAULT_MAX_NANO_CPUS: ${DIRECTOR_DEFAULT_MAX_NANO_CPUS}
292296
DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS: ${DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS}
@@ -299,12 +303,6 @@ services:
299303
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS: ${DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS}
300304
DIRECTOR_TRACING: ${DIRECTOR_TRACING}
301305

302-
POSTGRES_DB: ${POSTGRES_DB}
303-
POSTGRES_HOST: ${POSTGRES_HOST}
304-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
305-
POSTGRES_PORT: ${POSTGRES_PORT}
306-
POSTGRES_USER: ${POSTGRES_USER}
307-
308306
REGISTRY_AUTH: ${REGISTRY_AUTH}
309307
REGISTRY_PATH: ${REGISTRY_PATH}
310308
REGISTRY_PW: ${REGISTRY_PW}
@@ -333,7 +331,9 @@ services:
333331
init: true
334332
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
335333
environment:
336-
<<: *tracing_open_telemetry_environs
334+
<<:
335+
- *postgres_settings
336+
- *tracing_open_telemetry_environs
337337
AWS_S3_CLI_S3: ${AWS_S3_CLI_S3}
338338

339339
CATALOG_HOST: ${CATALOG_HOST}
@@ -370,12 +370,6 @@ services:
370370
DIRECTOR_V2_LOGLEVEL: ${DIRECTOR_V2_LOGLEVEL}
371371
MONITORING_ENABLED: ${MONITORING_ENABLED}
372372

373-
POSTGRES_DB: ${POSTGRES_DB}
374-
POSTGRES_HOST: ${POSTGRES_HOST}
375-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
376-
POSTGRES_PORT: ${POSTGRES_PORT}
377-
POSTGRES_USER: ${POSTGRES_USER}
378-
379373
R_CLONE_OPTION_BUFFER_SIZE: ${R_CLONE_OPTION_BUFFER_SIZE}
380374
R_CLONE_OPTION_RETRIES: ${R_CLONE_OPTION_RETRIES}
381375
R_CLONE_OPTION_TRANSFERS: ${R_CLONE_OPTION_TRANSFERS}
@@ -447,7 +441,9 @@ services:
447441
networks:
448442
- default
449443
environment:
450-
<<: *tracing_open_telemetry_environs
444+
<<:
445+
- *postgres_settings
446+
- *tracing_open_telemetry_environs
451447
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
452448
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
453449
RABBIT_HOST: ${RABBIT_HOST}
@@ -460,11 +456,6 @@ services:
460456
REDIS_PORT: ${REDIS_PORT}
461457
REDIS_SECURE: ${REDIS_SECURE}
462458
REDIS_USER: ${REDIS_USER}
463-
POSTGRES_DB: ${POSTGRES_DB}
464-
POSTGRES_HOST: ${POSTGRES_HOST}
465-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
466-
POSTGRES_PORT: ${POSTGRES_PORT}
467-
POSTGRES_USER: ${POSTGRES_USER}
468459
SC_USER_ID: ${SC_USER_ID}
469460
SC_USER_NAME: ${SC_USER_NAME}
470461
EFS_USER_ID: ${EFS_USER_ID}
@@ -503,7 +494,9 @@ services:
503494
networks:
504495
- default
505496
environment:
506-
<<: *tracing_open_telemetry_environs
497+
<<:
498+
- *postgres_settings
499+
- *tracing_open_telemetry_environs
507500

508501
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
509502
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
@@ -524,11 +517,6 @@ services:
524517
PAYMENTS_SWAGGER_API_DOC_ENABLED: ${PAYMENTS_SWAGGER_API_DOC_ENABLED}
525518
PAYMENTS_TRACING: ${PAYMENTS_TRACING}
526519
PAYMENTS_USERNAME: ${PAYMENTS_USERNAME}
527-
POSTGRES_DB: ${POSTGRES_DB}
528-
POSTGRES_HOST: ${POSTGRES_HOST}
529-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
530-
POSTGRES_PORT: ${POSTGRES_PORT}
531-
POSTGRES_USER: ${POSTGRES_USER}
532520
RABBIT_HOST: ${RABBIT_HOST}
533521
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
534522
RABBIT_PORT: ${RABBIT_PORT}
@@ -550,16 +538,13 @@ services:
550538
networks:
551539
- default
552540
environment:
553-
<<: *tracing_open_telemetry_environs
541+
<<:
542+
- *postgres_settings
543+
- *tracing_open_telemetry_environs
554544

555545
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
556546
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
557-
POSTGRES_DB: ${POSTGRES_DB}
558-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
559-
POSTGRES_HOST: ${POSTGRES_HOST}
560-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
561-
POSTGRES_PORT: ${POSTGRES_PORT}
562-
POSTGRES_USER: ${POSTGRES_USER}
547+
563548
PROMETHEUS_URL: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_URL}
564549
PROMETHEUS_USERNAME: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_USERNAME}
565550
PROMETHEUS_PASSWORD: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_PASSWORD}
@@ -590,7 +575,9 @@ services:
590575
- default
591576
- docker-api-network
592577
environment:
593-
<<: *tracing_open_telemetry_environs
578+
<<:
579+
- *postgres_settings
580+
- *tracing_open_telemetry_environs
594581

595582
CATALOG_HOST: ${CATALOG_HOST}
596583
CATALOG_PORT: ${CATALOG_PORT}
@@ -614,12 +601,6 @@ services:
614601
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
615602
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
616603

617-
POSTGRES_DB: ${POSTGRES_DB}
618-
POSTGRES_HOST: ${POSTGRES_HOST}
619-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
620-
POSTGRES_PORT: ${POSTGRES_PORT}
621-
POSTGRES_USER: ${POSTGRES_USER}
622-
623604
RABBIT_HOST: ${RABBIT_HOST}
624605
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
625606
RABBIT_PORT: ${RABBIT_PORT}
@@ -708,6 +689,7 @@ services:
708689
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
709690
environment: &webserver_environment
710691
<<:
692+
- *postgres_settings
711693
- *tracing_open_telemetry_environs
712694
- *webserver_diagnostics_environs
713695

@@ -748,16 +730,6 @@ services:
748730
# WEBSERVER_CREDIT_COMPUTATION
749731
WEBSERVER_CREDIT_COMPUTATION_ENABLED: ${WEBSERVER_CREDIT_COMPUTATION_ENABLED}
750732

751-
# WEBSERVER_DB
752-
POSTGRES_DB: ${POSTGRES_DB}
753-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
754-
POSTGRES_HOST: ${POSTGRES_HOST}
755-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
756-
POSTGRES_PORT: ${POSTGRES_PORT}
757-
POSTGRES_MINSIZE: ${POSTGRES_MINSIZE}
758-
POSTGRES_MAXSIZE: ${POSTGRES_MAXSIZE}
759-
POSTGRES_USER: ${POSTGRES_USER}
760-
761733
# WEBSERVER_DIAGNOSTICS
762734
WEBSERVER_DIAGNOSTICS: ${WEBSERVER_DIAGNOSTICS}
763735

@@ -968,6 +940,8 @@ services:
968940
init: true
969941
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
970942
environment:
943+
<<:
944+
- *postgres_settings
971945
WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL}
972946

973947
# NOTE: keep in sync with the prefix form the hostname
@@ -976,14 +950,6 @@ services:
976950
WEBSERVER_HOST: ${WEBSERVER_HOST}
977951
WEBSERVER_PORT: ${WEBSERVER_PORT}
978952

979-
# WEBSERVER_DB
980-
POSTGRES_DB: ${POSTGRES_DB}
981-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
982-
POSTGRES_HOST: ${POSTGRES_HOST}
983-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
984-
POSTGRES_PORT: ${POSTGRES_PORT}
985-
POSTGRES_USER: ${POSTGRES_USER}
986-
987953
DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
988954
DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
989955

@@ -1059,6 +1025,7 @@ services:
10591025
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
10601026
environment:
10611027
<<:
1028+
- *postgres_settings
10621029
- *tracing_open_telemetry_environs
10631030

10641031
# WEBSERVER_DIRECTOR_V2
@@ -1073,13 +1040,8 @@ services:
10731040
# NOTE: keep in sync with the prefix form the hostname
10741041
LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: gc
10751042

1076-
# WEBSERVER_DB
1077-
POSTGRES_DB: ${POSTGRES_DB}
1078-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1079-
POSTGRES_HOST: ${POSTGRES_HOST}
1080-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1081-
POSTGRES_PORT: ${POSTGRES_PORT}
1082-
POSTGRES_USER: ${POSTGRES_USER}
1043+
1044+
10831045

10841046
# WEBSERVER_RABBITMQ
10851047
RABBIT_HOST: ${RABBIT_HOST}
@@ -1159,8 +1121,9 @@ services:
11591121
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
11601122
environment:
11611123
<<:
1162-
- *webserver_diagnostics_environs
1124+
- *postgres_settings
11631125
- *tracing_open_telemetry_environs
1126+
- *webserver_diagnostics_environs
11641127

11651128
APP_NAME: "simcore_service_wb_auth"
11661129
WEBSERVER_APP_FACTORY_NAME: WEBSERVER_AUTHZ_APP_FACTORY
@@ -1171,13 +1134,6 @@ services:
11711134

11721135
GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
11731136

1174-
# WEBSERVER_DB
1175-
POSTGRES_DB: ${POSTGRES_DB}
1176-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1177-
POSTGRES_HOST: ${POSTGRES_HOST}
1178-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1179-
POSTGRES_PORT: ${POSTGRES_PORT}
1180-
POSTGRES_USER: ${POSTGRES_USER}
11811137

11821138
# WEBSERVER_DIAGNOSTICS
11831139
WEBSERVER_DIAGNOSTICS: ${WB_AUTH_DIAGNOSTICS}
@@ -1273,27 +1229,21 @@ services:
12731229
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
12741230

12751231
environment:
1232+
<<:
1233+
- *postgres_settings
1234+
- *tracing_open_telemetry_environs
12761235
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
12771236
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
12781237

12791238
NOTIFICATIONS_LOGLEVEL: ${NOTIFICATIONS_LOGLEVEL}
12801239
NOTIFICATIONS_TRACING: ${NOTIFICATIONS_TRACING}
12811240

1282-
POSTGRES_DB: ${POSTGRES_DB}
1283-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1284-
POSTGRES_HOST: ${POSTGRES_HOST}
1285-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1286-
POSTGRES_PORT: ${POSTGRES_PORT}
1287-
POSTGRES_USER: ${POSTGRES_USER}
1288-
12891241
RABBIT_HOST: ${RABBIT_HOST}
12901242
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
12911243
RABBIT_PORT: ${RABBIT_PORT}
12921244
RABBIT_SECURE: ${RABBIT_SECURE}
12931245
RABBIT_USER: ${RABBIT_USER}
12941246

1295-
<<: *tracing_open_telemetry_environs
1296-
12971247
dask-sidecar:
12981248
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
12991249
init: true
@@ -1356,15 +1306,12 @@ services:
13561306
init: true
13571307
hostname: "sto-{{.Node.Hostname}}-{{.Task.Slot}}"
13581308
environment: &storage_environment
1309+
<<:
1310+
- *postgres_settings
1311+
- *tracing_open_telemetry_environs
13591312
DATCORE_ADAPTER_HOST: ${DATCORE_ADAPTER_HOST:-datcore-adapter}
13601313
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
13611314
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
1362-
POSTGRES_DB: ${POSTGRES_DB}
1363-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1364-
POSTGRES_HOST: ${POSTGRES_HOST}
1365-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1366-
POSTGRES_PORT: ${POSTGRES_PORT}
1367-
POSTGRES_USER: ${POSTGRES_USER}
13681315
RABBIT_HOST: ${RABBIT_HOST}
13691316
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
13701317
RABBIT_PORT: ${RABBIT_PORT}
@@ -1386,7 +1333,6 @@ services:
13861333
STORAGE_PROFILING: ${STORAGE_PROFILING}
13871334
STORAGE_PORT: ${STORAGE_PORT}
13881335
STORAGE_TRACING: ${STORAGE_TRACING}
1389-
<<: *tracing_open_telemetry_environs
13901336
networks: &storage_networks
13911337
- default
13921338
- interactive_services_subnet
@@ -1444,12 +1390,7 @@ services:
14441390
init: true
14451391
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
14461392
environment:
1447-
POSTGRES_DB: ${POSTGRES_DB}
1448-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1449-
POSTGRES_HOST: ${POSTGRES_HOST}
1450-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1451-
POSTGRES_PORT: ${POSTGRES_PORT}
1452-
POSTGRES_USER: ${POSTGRES_USER}
1393+
<<: *postgres_settings
14531394
networks:
14541395
- default # actually needed for the postgres service only
14551396

0 commit comments

Comments
 (0)