Skip to content

Commit 3e8cd34

Browse files
sandereggsanderegg
committed
pass all postgres ENVs to the services
1 parent 278df26 commit 3e8cd34

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}
@@ -285,7 +287,9 @@ services:
285287
init: true
286288
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
287289
environment:
288-
<<: *tracing_open_telemetry_environs
290+
<<:
291+
- *postgres_settings
292+
- *tracing_open_telemetry_environs
289293
DIRECTOR_DEFAULT_MAX_MEMORY: ${DIRECTOR_DEFAULT_MAX_MEMORY}
290294
DIRECTOR_DEFAULT_MAX_NANO_CPUS: ${DIRECTOR_DEFAULT_MAX_NANO_CPUS}
291295
DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS: ${DIRECTOR_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS}
@@ -298,12 +302,6 @@ services:
298302
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS: ${DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS}
299303
DIRECTOR_TRACING: ${DIRECTOR_TRACING}
300304

301-
POSTGRES_DB: ${POSTGRES_DB}
302-
POSTGRES_HOST: ${POSTGRES_HOST}
303-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
304-
POSTGRES_PORT: ${POSTGRES_PORT}
305-
POSTGRES_USER: ${POSTGRES_USER}
306-
307305
REGISTRY_AUTH: ${REGISTRY_AUTH}
308306
REGISTRY_PATH: ${REGISTRY_PATH}
309307
REGISTRY_PW: ${REGISTRY_PW}
@@ -332,7 +330,9 @@ services:
332330
init: true
333331
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
334332
environment:
335-
<<: *tracing_open_telemetry_environs
333+
<<:
334+
- *postgres_settings
335+
- *tracing_open_telemetry_environs
336336
AWS_S3_CLI_S3: ${AWS_S3_CLI_S3}
337337

338338
CATALOG_HOST: ${CATALOG_HOST}
@@ -369,12 +369,6 @@ services:
369369
DIRECTOR_V2_LOGLEVEL: ${DIRECTOR_V2_LOGLEVEL}
370370
MONITORING_ENABLED: ${MONITORING_ENABLED}
371371

372-
POSTGRES_DB: ${POSTGRES_DB}
373-
POSTGRES_HOST: ${POSTGRES_HOST}
374-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
375-
POSTGRES_PORT: ${POSTGRES_PORT}
376-
POSTGRES_USER: ${POSTGRES_USER}
377-
378372
R_CLONE_OPTION_BUFFER_SIZE: ${R_CLONE_OPTION_BUFFER_SIZE}
379373
R_CLONE_OPTION_RETRIES: ${R_CLONE_OPTION_RETRIES}
380374
R_CLONE_OPTION_TRANSFERS: ${R_CLONE_OPTION_TRANSFERS}
@@ -446,7 +440,9 @@ services:
446440
networks:
447441
- default
448442
environment:
449-
<<: *tracing_open_telemetry_environs
443+
<<:
444+
- *postgres_settings
445+
- *tracing_open_telemetry_environs
450446
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
451447
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
452448
RABBIT_HOST: ${RABBIT_HOST}
@@ -459,11 +455,6 @@ services:
459455
REDIS_PORT: ${REDIS_PORT}
460456
REDIS_SECURE: ${REDIS_SECURE}
461457
REDIS_USER: ${REDIS_USER}
462-
POSTGRES_DB: ${POSTGRES_DB}
463-
POSTGRES_HOST: ${POSTGRES_HOST}
464-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
465-
POSTGRES_PORT: ${POSTGRES_PORT}
466-
POSTGRES_USER: ${POSTGRES_USER}
467458
SC_USER_ID: ${SC_USER_ID}
468459
SC_USER_NAME: ${SC_USER_NAME}
469460
EFS_USER_ID: ${EFS_USER_ID}
@@ -502,7 +493,9 @@ services:
502493
networks:
503494
- default
504495
environment:
505-
<<: *tracing_open_telemetry_environs
496+
<<:
497+
- *postgres_settings
498+
- *tracing_open_telemetry_environs
506499

507500
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
508501
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
@@ -523,11 +516,6 @@ services:
523516
PAYMENTS_SWAGGER_API_DOC_ENABLED: ${PAYMENTS_SWAGGER_API_DOC_ENABLED}
524517
PAYMENTS_TRACING: ${PAYMENTS_TRACING}
525518
PAYMENTS_USERNAME: ${PAYMENTS_USERNAME}
526-
POSTGRES_DB: ${POSTGRES_DB}
527-
POSTGRES_HOST: ${POSTGRES_HOST}
528-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
529-
POSTGRES_PORT: ${POSTGRES_PORT}
530-
POSTGRES_USER: ${POSTGRES_USER}
531519
RABBIT_HOST: ${RABBIT_HOST}
532520
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
533521
RABBIT_PORT: ${RABBIT_PORT}
@@ -549,16 +537,13 @@ services:
549537
networks:
550538
- default
551539
environment:
552-
<<: *tracing_open_telemetry_environs
540+
<<:
541+
- *postgres_settings
542+
- *tracing_open_telemetry_environs
553543

554544
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
555545
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
556-
POSTGRES_DB: ${POSTGRES_DB}
557-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
558-
POSTGRES_HOST: ${POSTGRES_HOST}
559-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
560-
POSTGRES_PORT: ${POSTGRES_PORT}
561-
POSTGRES_USER: ${POSTGRES_USER}
546+
562547
PROMETHEUS_URL: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_URL}
563548
PROMETHEUS_USERNAME: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_USERNAME}
564549
PROMETHEUS_PASSWORD: ${RESOURCE_USAGE_TRACKER_PROMETHEUS_PASSWORD}
@@ -589,7 +574,9 @@ services:
589574
- default
590575
- docker-api-network
591576
environment:
592-
<<: *tracing_open_telemetry_environs
577+
<<:
578+
- *postgres_settings
579+
- *tracing_open_telemetry_environs
593580

594581
CATALOG_HOST: ${CATALOG_HOST}
595582
CATALOG_PORT: ${CATALOG_PORT}
@@ -613,12 +600,6 @@ services:
613600
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
614601
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
615602

616-
POSTGRES_DB: ${POSTGRES_DB}
617-
POSTGRES_HOST: ${POSTGRES_HOST}
618-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
619-
POSTGRES_PORT: ${POSTGRES_PORT}
620-
POSTGRES_USER: ${POSTGRES_USER}
621-
622603
RABBIT_HOST: ${RABBIT_HOST}
623604
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
624605
RABBIT_PORT: ${RABBIT_PORT}
@@ -707,6 +688,7 @@ services:
707688
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
708689
environment: &webserver_environment
709690
<<:
691+
- *postgres_settings
710692
- *tracing_open_telemetry_environs
711693
- *webserver_diagnostics_environs
712694

@@ -747,16 +729,6 @@ services:
747729
# WEBSERVER_CREDIT_COMPUTATION
748730
WEBSERVER_CREDIT_COMPUTATION_ENABLED: ${WEBSERVER_CREDIT_COMPUTATION_ENABLED}
749731

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

@@ -967,6 +939,8 @@ services:
967939
init: true
968940
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
969941
environment:
942+
<<:
943+
- *postgres_settings
970944
WEBSERVER_LOGLEVEL: ${WB_DB_EL_LOGLEVEL}
971945

972946
# NOTE: keep in sync with the prefix form the hostname
@@ -975,14 +949,6 @@ services:
975949
WEBSERVER_HOST: ${WEBSERVER_HOST}
976950
WEBSERVER_PORT: ${WEBSERVER_PORT}
977951

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

@@ -1058,6 +1024,7 @@ services:
10581024
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
10591025
environment:
10601026
<<:
1027+
- *postgres_settings
10611028
- *tracing_open_telemetry_environs
10621029

10631030
# WEBSERVER_DIRECTOR_V2
@@ -1072,13 +1039,8 @@ services:
10721039
# NOTE: keep in sync with the prefix form the hostname
10731040
LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: gc
10741041

1075-
# WEBSERVER_DB
1076-
POSTGRES_DB: ${POSTGRES_DB}
1077-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1078-
POSTGRES_HOST: ${POSTGRES_HOST}
1079-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1080-
POSTGRES_PORT: ${POSTGRES_PORT}
1081-
POSTGRES_USER: ${POSTGRES_USER}
1042+
1043+
10821044

10831045
# WEBSERVER_RABBITMQ
10841046
RABBIT_HOST: ${RABBIT_HOST}
@@ -1158,8 +1120,9 @@ services:
11581120
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
11591121
environment:
11601122
<<:
1161-
- *webserver_diagnostics_environs
1123+
- *postgres_settings
11621124
- *tracing_open_telemetry_environs
1125+
- *webserver_diagnostics_environs
11631126

11641127
APP_NAME: "simcore_service_wb_auth"
11651128
WEBSERVER_APP_FACTORY_NAME: WEBSERVER_AUTHZ_APP_FACTORY
@@ -1170,13 +1133,6 @@ services:
11701133

11711134
GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
11721135

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

11811137
# WEBSERVER_DIAGNOSTICS
11821138
WEBSERVER_DIAGNOSTICS: ${WB_AUTH_DIAGNOSTICS}
@@ -1272,27 +1228,21 @@ services:
12721228
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
12731229

12741230
environment:
1231+
<<:
1232+
- *postgres_settings
1233+
- *tracing_open_telemetry_environs
12751234
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
12761235
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
12771236

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

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

1294-
<<: *tracing_open_telemetry_environs
1295-
12961246
dask-sidecar:
12971247
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
12981248
init: true
@@ -1355,15 +1305,12 @@ services:
13551305
init: true
13561306
hostname: "sto-{{.Node.Hostname}}-{{.Task.Slot}}"
13571307
environment: &storage_environment
1308+
<<:
1309+
- *postgres_settings
1310+
- *tracing_open_telemetry_environs
13581311
DATCORE_ADAPTER_HOST: ${DATCORE_ADAPTER_HOST:-datcore-adapter}
13591312
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
13601313
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
1361-
POSTGRES_DB: ${POSTGRES_DB}
1362-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1363-
POSTGRES_HOST: ${POSTGRES_HOST}
1364-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1365-
POSTGRES_PORT: ${POSTGRES_PORT}
1366-
POSTGRES_USER: ${POSTGRES_USER}
13671314
RABBIT_HOST: ${RABBIT_HOST}
13681315
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
13691316
RABBIT_PORT: ${RABBIT_PORT}
@@ -1385,7 +1332,6 @@ services:
13851332
STORAGE_PROFILING: ${STORAGE_PROFILING}
13861333
STORAGE_PORT: ${STORAGE_PORT}
13871334
STORAGE_TRACING: ${STORAGE_TRACING}
1388-
<<: *tracing_open_telemetry_environs
13891335
networks: &storage_networks
13901336
- default
13911337
- interactive_services_subnet
@@ -1441,12 +1387,7 @@ services:
14411387
init: true
14421388
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
14431389
environment:
1444-
POSTGRES_DB: ${POSTGRES_DB}
1445-
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
1446-
POSTGRES_HOST: ${POSTGRES_HOST}
1447-
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
1448-
POSTGRES_PORT: ${POSTGRES_PORT}
1449-
POSTGRES_USER: ${POSTGRES_USER}
1390+
<<: *postgres_settings
14501391
networks:
14511392
- default # actually needed for the postgres service only
14521393

0 commit comments

Comments
 (0)