Skip to content

Commit a7820df

Browse files
rikukissarikukissa
committed
use fully qualified service name references
1 parent 645ea9a commit a7820df

File tree

1 file changed

+76
-76
lines changed

1 file changed

+76
-76
lines changed

‎infrastructure/docker-compose.app.yml‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- source: hearth-queryparam-extensions-conf.{{ts}}
2020
target: /src/hearth/config/queryparam-extensions.json
2121
networks:
22-
- {{STACK}}_overlay_net
22+
- app_net
2323
- dependencies_overlay_net
2424
logging:
2525
driver: gelf
@@ -40,13 +40,13 @@ services:
4040
- APN_SERVICE_URL=http://apm-server:8200
4141
- CERT_PUBLIC_KEY_PATH=/run/secrets/jwt-public-key.{{STACK}}.{{ts}}
4242
- MONGO_URL=mongodb://${STACK}__notification:${NOTIFICATION_MONGODB_PASSWORD}@mongo1/${STACK}__notification?replicaSet=rs0
43-
- COUNTRY_CONFIG_URL=http://countryconfig:3040
43+
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_app_net:3040
4444
deploy:
4545
replicas: 1
4646
labels:
4747
- 'traefik.enable=false'
4848
networks:
49-
- {{STACK}}_overlay_net
49+
- app_net
5050
- dependencies_overlay_net
5151
logging:
5252
driver: gelf
@@ -89,10 +89,10 @@ services:
8989
- QA_ENV=true
9090
- HOST=0.0.0.0
9191
- NODE_ENV=production
92-
- FHIR_URL=http://hearth:3447/fhir
93-
- AUTH_URL=http://auth:4040
94-
- APPLICATION_CONFIG_URL=http://config:2021
95-
- CONFIRM_REGISTRATION_URL=http://workflow:5050/confirm/registration
92+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
93+
- AUTH_URL=http://auth.{{STACK}}_app_net:4040
94+
- APPLICATION_CONFIG_URL=http://config.{{STACK}}_app_net:2021
95+
- CONFIRM_REGISTRATION_URL=http://workflow.{{STACK}}_app_net:5050/confirm/registration
9696
- MONGO_URL=mongodb://mongo1/${STACK}__user-mgnt?replicaSet=rs0
9797
- CONFIG_MONGO_URL=mongodb://mongo1/${STACK}__application-config?replicaSet=rs0
9898
- APN_SERVICE_URL=http://apm-server:8200
@@ -102,7 +102,7 @@ services:
102102
- SENDER_EMAIL_ADDRESS=${SENDER_EMAIL_ADDRESS}
103103
# This needs to be the internal swarm url
104104
# as containers cannot connect to the web
105-
- GATEWAY_URL=http://gateway:7070
105+
- GATEWAY_URL=http://gateway.{{STACK}}_app_net:7070
106106
- NOTIFICATION_TRANSPORT=${NOTIFICATION_TRANSPORT}
107107
- ALERT_EMAIL=${ALERT_EMAIL:-}
108108
- SMTP_HOST=${SMTP_HOST:-}
@@ -115,7 +115,7 @@ services:
115115
- INFOBIP_SENDER_ID=${INFOBIP_SENDER_ID:-}
116116
- DOMAIN=${STACK}.{{hostname}}
117117
networks:
118-
- {{STACK}}_overlay_net
118+
- app_net
119119
- dependencies_overlay_net
120120
logging:
121121
driver: gelf
@@ -148,7 +148,7 @@ services:
148148
- 'traefik.http.middlewares.${STACK}__login.headers.stspreload=true'
149149
replicas: 1
150150
networks:
151-
- {{STACK}}_overlay_net
151+
- app_net
152152
- dependencies_overlay_net
153153
logging:
154154
driver: gelf
@@ -187,7 +187,7 @@ services:
187187
- 'traefik.http.middlewares.${STACK}__client.headers.stspreload=true'
188188
replicas: 1
189189
networks:
190-
- {{STACK}}_overlay_net
190+
- app_net
191191
- dependencies_overlay_net
192192
logging:
193193
driver: gelf
@@ -215,18 +215,18 @@ services:
215215
- REDIS_HOST=redis
216216
- CONFIG_SMS_CODE_EXPIRY_SECONDS=600
217217
- CONFIG_TOKEN_EXPIRY_SECONDS=604800
218-
- FHIR_URL=http://hearth:3447/fhir
219-
- USER_MANAGEMENT_URL=http://user-mgnt:3030/
220-
- SEARCH_URL=http://search:9090/
221-
- METRICS_URL=http://metrics:1050
222-
- AUTH_URL=http://auth:4040
223-
- COUNTRY_CONFIG_URL=http://countryconfig:3040
224-
- NOTIFICATION_URL=http://notification:2020/
225-
- WORKFLOW_URL=http://workflow:5050/
226-
- APPLICATION_CONFIG_URL=http://config:2021/
227-
- WEBHOOKS_URL=http://webhooks:2525/
218+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
219+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030/
220+
- SEARCH_URL=http://search.{{STACK}}_app_net:9090/
221+
- METRICS_URL=http://metrics.{{STACK}}_app_net:1050
222+
- AUTH_URL=http://auth.{{STACK}}_app_net:4040
223+
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_app_net:3040
224+
- NOTIFICATION_URL=http://notification.{{STACK}}_app_net:2020/
225+
- WORKFLOW_URL=http://workflow.{{STACK}}_app_net:5050/
226+
- APPLICATION_CONFIG_URL=http://config.{{STACK}}_app_net:2021/
227+
- WEBHOOKS_URL=http://webhooks.{{STACK}}_app_net:2525/
228228
- CHECK_INVALID_TOKEN=true
229-
- DOCUMENTS_URL=http://documents:9050
229+
- DOCUMENTS_URL=http://documents.{{STACK}}_app_net:9050
230230
deploy:
231231
labels:
232232
- 'traefik.enable=true'
@@ -245,7 +245,7 @@ services:
245245
- 'traefik.http.middlewares.${STACK}__gateway.headers.stspreload=true'
246246
replicas: 1
247247
networks:
248-
- {{STACK}}_overlay_net
248+
- app_net
249249
- dependencies_overlay_net
250250
logging:
251251
driver: gelf
@@ -265,22 +265,22 @@ services:
265265
- SENTRY_DSN=${SENTRY_DSN:-}
266266
- APN_SERVICE_URL=http://apm-server:8200
267267
- CERT_PUBLIC_KEY_PATH=/run/secrets/jwt-public-key.{{STACK}}.{{ts}}
268-
- SEARCH_URL=http://search:9090/
269-
- METRICS_URL=http://metrics:1050
270-
- DOCUMENTS_URL=http://documents:9050
271-
- NOTIFICATION_SERVICE_URL=http://notification:2020/
272-
- USER_MANAGEMENT_URL=http://user-mgnt:3030/
273-
- COUNTRY_CONFIG_URL=http://countryconfig:3040
274-
- FHIR_URL=http://hearth:3447/fhir
275-
- WEBHOOKS_URL=http://webhooks:2525/
276-
- APPLICATION_CONFIG_URL=http://config:2021/
268+
- SEARCH_URL=http://search.{{STACK}}_app_net:9090/
269+
- METRICS_URL=http://metrics.{{STACK}}_app_net:1050
270+
- DOCUMENTS_URL=http://documents.{{STACK}}_app_net:9050
271+
- NOTIFICATION_SERVICE_URL=http://notification.{{STACK}}_app_net:2020/
272+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030/
273+
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_app_net:3040
274+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
275+
- WEBHOOKS_URL=http://webhooks.{{STACK}}_app_net:2525/
276+
- APPLICATION_CONFIG_URL=http://config.{{STACK}}_app_net:2021/
277277
- COUNTRY=${COUNTRY:-bgd}
278278
deploy:
279279
labels:
280280
- 'traefik.enable=false'
281281
replicas: 1
282282
networks:
283-
- {{STACK}}_overlay_net
283+
- app_net
284284
- dependencies_overlay_net
285285
logging:
286286
driver: gelf
@@ -302,15 +302,15 @@ services:
302302
- APN_SERVICE_URL=http://apm-server:8200
303303
- CERT_PUBLIC_KEY_PATH=/run/secrets/jwt-public-key.{{STACK}}.{{ts}}
304304
- HEARTH_MONGO_URL=mongodb://${STACK}__hearth:${HEARTH_MONGODB_PASSWORD}@mongo1/${STACK}__hearth-dev?replicaSet=rs0
305-
- USER_MANAGEMENT_URL=http://user-mgnt:3030/
306-
- FHIR_URL=http://hearth:3447/fhir
307-
- APPLICATION_CONFIG_URL=http://config:2021/
305+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030/
306+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
307+
- APPLICATION_CONFIG_URL=http://config.{{STACK}}_app_net:2021/
308308
deploy:
309309
labels:
310310
- 'traefik.enable=false'
311311
replicas: 1
312312
networks:
313-
- {{STACK}}_overlay_net
313+
- app_net
314314
- dependencies_overlay_net
315315
logging:
316316
driver: gelf
@@ -336,12 +336,12 @@ services:
336336
- INFLUX_HOST=influxdb
337337
- INFLUX_PORT=8086
338338
- INFLUX_DB=${STACK}_ocrvs
339-
- COUNTRY_CONFIG_URL=http://countryconfig:3040/
340-
- CONFIG_API_URL=http://config:2021
341-
- SEARCH_URL=http://search:9090/
342-
- USER_MANAGEMENT_URL=http://user-mgnt:3030
343-
- DOCUMENTS_URL=http://documents:9050
344-
- FHIR_URL=http://hearth:3447/fhir
339+
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_app_net:3040/
340+
- CONFIG_API_URL=http://config.{{STACK}}_app_net:2021
341+
- SEARCH_URL=http://search.{{STACK}}_app_net:9090/
342+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030
343+
- DOCUMENTS_URL=http://documents.{{STACK}}_app_net:9050
344+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
345345
deploy:
346346
placement:
347347
constraints:
@@ -350,7 +350,7 @@ services:
350350
- 'traefik.enable=false'
351351
replicas: 1
352352
networks:
353-
- {{STACK}}_overlay_net
353+
- app_net
354354
- dependencies_overlay_net
355355
logging:
356356
driver: gelf
@@ -376,11 +376,11 @@ services:
376376
- CLIENT_APP_URL=https://register.${STACK}.{{hostname}}
377377
- DOMAIN=${STACK}.{{hostname}}
378378
- REDIS_HOST=redis
379-
- USER_MANAGEMENT_URL=http://user-mgnt:3030/
379+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030/
380380
- CONFIG_TOKEN_EXPIRY_SECONDS=604800
381381
- CONFIG_SMS_CODE_EXPIRY_SECONDS=600
382-
- NOTIFICATION_SERVICE_URL=http://notification:2020/
383-
- METRICS_URL=http://metrics:1050
382+
- NOTIFICATION_SERVICE_URL=http://notification.{{STACK}}_app_net:2020/
383+
- METRICS_URL=http://metrics.{{STACK}}_app_net:1050
384384
deploy:
385385
labels:
386386
- 'traefik.enable=true'
@@ -398,7 +398,7 @@ services:
398398
- 'traefik.http.middlewares.${STACK}__auth.headers.stspreload=true'
399399
replicas: 1
400400
networks:
401-
- {{STACK}}_overlay_net
401+
- app_net
402402
- dependencies_overlay_net
403403
logging:
404404
driver: gelf
@@ -419,17 +419,17 @@ services:
419419
- RECORD_SEARCH_QUOTA=2000
420420
- CERT_PUBLIC_KEY_PATH=/run/secrets/jwt-public-key.{{STACK}}.{{ts}}
421421
- MONGO_URL=mongodb://${STACK}__user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1/${STACK}__user-mgnt?replicaSet=rs0
422-
- NOTIFICATION_SERVICE_URL=http://notification:2020/
423-
- METRICS_URL=http://metrics:1050
424-
- FHIR_URL=http://hearth:3447/fhir
425-
- APPLICATION_CONFIG_URL=http://config:2021/
426-
- DOCUMENTS_URL=http://documents:9050
422+
- NOTIFICATION_SERVICE_URL=http://notification.{{STACK}}_app_net:2020/
423+
- METRICS_URL=http://metrics.{{STACK}}_app_net:1050
424+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
425+
- APPLICATION_CONFIG_URL=http://config.{{STACK}}_app_net:2021/
426+
- DOCUMENTS_URL=http://documents.{{STACK}}_app_net:9050
427427
deploy:
428428
labels:
429429
- 'traefik.enable=false'
430430
replicas: 1
431431
networks:
432-
- {{STACK}}_overlay_net
432+
- app_net
433433
- dependencies_overlay_net
434434
logging:
435435
driver: gelf
@@ -450,10 +450,10 @@ services:
450450
- MONGO_URL=mongodb://${STACK}__webhooks:${WEBHOOKS_MONGODB_PASSWORD}@mongo1/${STACK}__webhooks?replicaSet=rs0
451451
- CERT_PUBLIC_KEY_PATH=/run/secrets/jwt-public-key.{{STACK}}.{{ts}}
452452
- REDIS_HOST=redis
453-
- AUTH_URL=http://auth:4040
454-
- USER_MANAGEMENT_URL=http://user-mgnt:3030/
453+
- AUTH_URL=http://auth.{{STACK}}_app_net:4040
454+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030/
455455
- CHECK_INVALID_TOKEN=true
456-
- FHIR_URL=http://hearth:3447/fhir
456+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
457457
deploy:
458458
labels:
459459
- 'traefik.enable=true'
@@ -471,7 +471,7 @@ services:
471471
- 'traefik.http.middlewares.${STACK}__webhooks.headers.stspreload=true'
472472
replicas: 1
473473
networks:
474-
- {{STACK}}_overlay_net
474+
- app_net
475475
- dependencies_overlay_net
476476
logging:
477477
driver: gelf
@@ -494,14 +494,14 @@ services:
494494
- LOGIN_URL=https://login.${STACK}.{{hostname}}
495495
- CLIENT_APP_URL=https://register.${STACK}.{{hostname}}
496496
- DOMAIN=${STACK}.{{hostname}}
497-
- AUTH_URL=http://auth:4040
498-
- COUNTRY_CONFIG_URL=http://countryconfig:3040
499-
- SEARCH_URL=http://search:9090/
500-
- METRICS_URL=http://metrics:1050
501-
- USER_MANAGEMENT_URL=http://user-mgnt:3030/
502-
- FHIR_URL=http://hearth:3447/fhir
503-
- GATEWAY_URL=http://gateway:7070/
504-
- DOCUMENTS_URL=http://documents:9050
497+
- AUTH_URL=http://auth.{{STACK}}_app_net:4040
498+
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_app_net:3040
499+
- SEARCH_URL=http://search.{{STACK}}_app_net:9090/
500+
- METRICS_URL=http://metrics.{{STACK}}_app_net:1050
501+
- USER_MANAGEMENT_URL=http://user-mgnt.{{STACK}}_app_net:3030/
502+
- FHIR_URL=http://hearth.{{STACK}}_app_net:3447/fhir
503+
- GATEWAY_URL=http://gateway.{{STACK}}_app_net:7070/
504+
- DOCUMENTS_URL=http://documents.{{STACK}}_app_net:9050
505505
- CHECK_INVALID_TOKEN=true
506506
deploy:
507507
labels:
@@ -523,7 +523,7 @@ services:
523523
- 'traefik.http.routers.${STACK}__block-dashboard-queries.middlewares=${STACK}__block-internal-routes'
524524
replicas: 1
525525
networks:
526-
- {{STACK}}_overlay_net
526+
- app_net
527527
- dependencies_overlay_net
528528
logging:
529529
driver: gelf
@@ -551,9 +551,9 @@ services:
551551
- MINIO_HOST=minio
552552
- MINIO_PORT=9000
553553
- MINIO_BUCKET=${STACK}--ocrvs
554-
- COUNTRY_CONFIG_URL=http://countryconfig:3040
554+
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_app_net:3040
555555
networks:
556-
- {{STACK}}_overlay_net
556+
- app_net
557557
- dependencies_overlay_net
558558
logging:
559559
driver: gelf
@@ -566,13 +566,13 @@ services:
566566
environment:
567567
- QA_ENV=true
568568
- NODE_ENV=production
569-
- METRICS_URL=http://metrics:1050
569+
- METRICS_URL=http://metrics.{{STACK}}_app_net:1050
570570
deploy:
571571
replicas: 1
572572
labels:
573573
- 'traefik.enable=false'
574574
networks:
575-
- {{STACK}}_overlay_net
575+
- app_net
576576
- dependencies_overlay_net
577577
logging:
578578
driver: gelf
@@ -600,7 +600,7 @@ services:
600600
- SUPER_USER_PASSWORD=${SUPER_USER_PASSWORD}
601601
- STACK=${STACK}
602602
- DASHBOARD_MONGO_URL=mongodb://mongo1/${STACK}__performance
603-
- SEARCH_URL=http://search:9090/
603+
- SEARCH_URL=http://search.{{STACK}}_app_net:9090/
604604
- INFLUX_HOST=influxdb
605605
- INFLUX_PORT=8086
606606
- INFLUX_DB=${STACK}_ocrvs
@@ -612,7 +612,7 @@ services:
612612
restart_policy:
613613
condition: on-failure
614614
networks:
615-
- {{STACK}}_overlay_net
615+
- app_net
616616
- dependencies_overlay_net
617617
logging:
618618
driver: gelf
@@ -647,7 +647,7 @@ services:
647647
- WEBHOOKS_MONGODB_PASSWORD=${WEBHOOKS_MONGODB_PASSWORD}
648648
- NOTIFICATION_MONGODB_PASSWORD=${NOTIFICATION_MONGODB_PASSWORD}
649649
networks:
650-
- {{STACK}}_overlay_net
650+
- app_net
651651
- dependencies_overlay_net
652652
logging:
653653
driver: gelf
@@ -662,7 +662,7 @@ services:
662662
# Exceed Docker config file 500 kb file limit, thus a volume mount
663663
- /opt/opencrvs/infrastructure/metabase/metabase.init.db.sql:/metabase.init.db.sql
664664
networks:
665-
- {{STACK}}_overlay_net
665+
- app_net
666666
- dependencies_overlay_net
667667
environment:
668668
- QA_ENV=true
@@ -735,6 +735,6 @@ configs:
735735
networks:
736736
dependencies_overlay_net:
737737
external: true
738-
{{STACK}}_overlay_net:
738+
app_net:
739739
driver: overlay
740740
attachable: true

0 commit comments

Comments
 (0)