Skip to content

Commit 02e0459

Browse files
rikukissarikukissa
committed
try different approach for networking so dependencies wouldnt have to be restarted
1 parent 268464e commit 02e0459

File tree

2 files changed

+29
-39
lines changed

2 files changed

+29
-39
lines changed

‎infrastructure/deployment/deploy.sh‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,13 @@ docker_stack_deploy() {
302302

303303
EXISTING_STACKS=$(configured_ssh 'docker stack ls --format "{{ .Name }}" | grep -v "dependencies" | paste -sd "," -')
304304

305-
configured_rsync -rlD $SSH_USER@$SSH_HOST:/opt/opencrvs/infrastructure/docker-compose.dependencies.yml ./infrastructure/docker-compose.dependencies.yml
306-
307-
REFRESH_DEPENDENCY_NETWORKS=false
308-
309305
if echo $EXISTING_STACKS | grep -w $STACK > /dev/null; then
310306
echo "Stack $STACK exists"
311-
npx tsx infrastructure/deployment/add-networks.ts infrastructure/docker-compose.dependencies.yml "$EXISTING_STACKS" > ./docker-compose.dependencies.yml
312307
else
313308
echo "Stack $STACK doesnt exist. Creating"
314-
REFRESH_DEPENDENCY_NETWORKS=true
315-
npx tsx infrastructure/deployment/add-networks.ts infrastructure/docker-compose.dependencies.yml "$EXISTING_STACKS,$STACK" > ./docker-compose.dependencies.yml
316309
fi
317310

318-
configured_rsync -rlD ./docker-compose.dependencies.yml $SSH_USER@$SSH_HOST:/opt/opencrvs/infrastructure/docker-compose.dependencies.yml
319-
320-
if [ "$REFRESH_DEPENDENCY_NETWORKS" = true ] || [ "$UPDATE_DEPENDENCIES" = true ]; then
311+
if [ "$UPDATE_DEPENDENCIES" = true ]; then
321312
echo "Updating dependency stack"
322313
configured_ssh 'cd /opt/opencrvs && \
323314
docker stack deploy --prune -c '$(split_and_join " " " -c " "$(to_remote_paths $DEPENDENCY_COMPOSE_FILES)")' --with-registry-auth dependencies'
@@ -326,7 +317,6 @@ docker_stack_deploy() {
326317
configured_ssh 'cd /opt/opencrvs && \
327318
docker stack deploy --prune -c '$(split_and_join " " " -c " "$(to_remote_paths $APPLICATION_COMPOSE_FILES)")' --with-registry-auth '$STACK
328319

329-
330320
}
331321

332322
validate_options

‎infrastructure/docker-compose.app.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
target: /src/hearth/config/queryparam-extensions.json
2121
networks:
2222
- {{STACK}}_app_net
23-
- dependencies_{{STACK}}_dependencies_net
23+
- dependencies_internal_net
2424
logging:
2525
driver: gelf
2626
options:
@@ -47,7 +47,7 @@ services:
4747
- 'traefik.enable=false'
4848
networks:
4949
- {{STACK}}_app_net
50-
- dependencies_{{STACK}}_dependencies_net
50+
- dependencies_internal_net
5151
logging:
5252
driver: gelf
5353
options:
@@ -70,7 +70,7 @@ services:
7070
- 'traefik.http.routers.${STACK}__countryconfig.tls.domains[0].sans=*.${STACK}.{{hostname}}'
7171
- 'traefik.http.routers.${STACK}__countryconfig.entrypoints=web,websecure'
7272
- 'traefik.http.routers.${STACK}__countryconfig.middlewares=gzip-compression'
73-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
73+
- 'traefik.docker.network=dependencies_internal_net
7474
- 'traefik.http.middlewares.${STACK}__countryconfig.headers.customresponseheaders.Pragma=no-cache'
7575
- 'traefik.http.middlewares.${STACK}__countryconfig.headers.customresponseheaders.Cache-control=no-store'
7676
- 'traefik.http.middlewares.${STACK}__countryconfig.headers.customresponseheaders.X-Robots-Tag=none'
@@ -118,7 +118,7 @@ services:
118118
- DOMAIN=${STACK}.{{hostname}}
119119
networks:
120120
- {{STACK}}_app_net
121-
- dependencies_{{STACK}}_dependencies_net
121+
- dependencies_internal_net
122122
logging:
123123
driver: gelf
124124
options:
@@ -143,7 +143,7 @@ services:
143143
- 'traefik.http.routers.${STACK}__login.tls.domains[0].sans=*.${STACK}.{{hostname}}'
144144
- 'traefik.http.routers.${STACK}__login.entrypoints=web,websecure'
145145
- 'traefik.http.routers.${STACK}__login.middlewares=gzip-compression'
146-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
146+
- 'traefik.docker.network=dependencies_internal_net
147147
- 'traefik.http.middlewares.${STACK}__login.headers.customresponseheaders.Pragma=no-cache'
148148
- 'traefik.http.middlewares.${STACK}__login.headers.customresponseheaders.Cache-control=no-store'
149149
- 'traefik.http.middlewares.${STACK}__login.headers.customresponseheaders.X-Robots-Tag=none'
@@ -153,7 +153,7 @@ services:
153153
replicas: 1
154154
networks:
155155
- {{STACK}}_app_net
156-
- dependencies_{{STACK}}_dependencies_net
156+
- dependencies_internal_net
157157
logging:
158158
driver: gelf
159159
options:
@@ -180,7 +180,7 @@ services:
180180
- 'traefik.http.routers.${STACK}__client.tls.domains[0].main=${STACK}.{{hostname}}'
181181
- 'traefik.http.routers.${STACK}__client.tls.domains[0].sans=*.${STACK}.{{hostname}}'
182182
- 'traefik.http.routers.${STACK}__client.entrypoints=web,websecure'
183-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
183+
- 'traefik.docker.network=dependencies_internal_net
184184
185185
- 'traefik.http.middlewares.${STACK}__test-replacepathregex.redirectregex.permanent=true'
186186
- 'traefik.http.middlewares.${STACK}__test-replacepathregex.redirectregex.regex=^https?://${STACK}.{{hostname}}/(.*)'
@@ -194,7 +194,7 @@ services:
194194
replicas: 1
195195
networks:
196196
- {{STACK}}_app_net
197-
- dependencies_{{STACK}}_dependencies_net
197+
- dependencies_internal_net
198198
logging:
199199
driver: gelf
200200
options:
@@ -244,7 +244,7 @@ services:
244244
- 'traefik.http.routers.${STACK}__gateway.tls.domains[0].sans=*.${STACK}.{{hostname}}'
245245
- 'traefik.http.routers.${STACK}__gateway.entrypoints=web,websecure'
246246
- 'traefik.http.routers.${STACK}__gateway.middlewares=gzip-compression'
247-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
247+
- 'traefik.docker.network=dependencies_internal_net
248248
- 'traefik.http.middlewares.${STACK}__gateway.headers.customresponseheaders.Pragma=no-cache'
249249
- 'traefik.http.middlewares.${STACK}__gateway.headers.customresponseheaders.Cache-control=no-store'
250250
- 'traefik.http.middlewares.${STACK}__gateway.headers.customresponseheaders.X-Robots-Tag=none'
@@ -254,7 +254,7 @@ services:
254254
replicas: 1
255255
networks:
256256
- {{STACK}}_app_net
257-
- dependencies_{{STACK}}_dependencies_net
257+
- dependencies_internal_net
258258
logging:
259259
driver: gelf
260260
options:
@@ -289,7 +289,7 @@ services:
289289
replicas: 1
290290
networks:
291291
- {{STACK}}_app_net
292-
- dependencies_{{STACK}}_dependencies_net
292+
- dependencies_internal_net
293293
logging:
294294
driver: gelf
295295
options:
@@ -319,7 +319,7 @@ services:
319319
replicas: 1
320320
networks:
321321
- {{STACK}}_app_net
322-
- dependencies_{{STACK}}_dependencies_net
322+
- dependencies_internal_net
323323
logging:
324324
driver: gelf
325325
options:
@@ -343,7 +343,7 @@ services:
343343
- '/opt/opencrvs/infrastructure/elasticsearch:/usr/app'
344344
networks:
345345
- {{STACK}}_app_net
346-
- dependencies_{{STACK}}_dependencies_net
346+
- dependencies_internal_net
347347
deploy:
348348
labels:
349349
- 'traefik.enable=false'
@@ -391,7 +391,7 @@ services:
391391
replicas: 1
392392
networks:
393393
- {{STACK}}_app_net
394-
- dependencies_{{STACK}}_dependencies_net
394+
- dependencies_internal_net
395395
logging:
396396
driver: gelf
397397
options:
@@ -431,7 +431,7 @@ services:
431431
- 'traefik.http.routers.${STACK}__auth.tls.domains[0].main=${STACK}.{{hostname}}'
432432
- 'traefik.http.routers.${STACK}__auth.tls.domains[0].sans=*.${STACK}.{{hostname}}'
433433
- 'traefik.http.routers.${STACK}__auth.entrypoints=web,websecure'
434-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
434+
- 'traefik.docker.network=dependencies_internal_net
435435
- 'traefik.http.middlewares.${STACK}__auth.headers.customresponseheaders.Pragma=no-cache'
436436
- 'traefik.http.middlewares.${STACK}__auth.headers.customresponseheaders.Cache-control=no-store'
437437
- 'traefik.http.middlewares.${STACK}__auth.headers.customresponseheaders.X-Robots-Tag=none'
@@ -441,7 +441,7 @@ services:
441441
replicas: 1
442442
networks:
443443
- {{STACK}}_app_net
444-
- dependencies_{{STACK}}_dependencies_net
444+
- dependencies_internal_net
445445
logging:
446446
driver: gelf
447447
options:
@@ -472,7 +472,7 @@ services:
472472
replicas: 1
473473
networks:
474474
- {{STACK}}_app_net
475-
- dependencies_{{STACK}}_dependencies_net
475+
- dependencies_internal_net
476476
logging:
477477
driver: gelf
478478
options:
@@ -506,7 +506,7 @@ services:
506506
- 'traefik.http.routers.${STACK}__webhooks.tls.domains[0].main=${STACK}.{{hostname}}'
507507
- 'traefik.http.routers.${STACK}__webhooks.tls.domains[0].sans=*.${STACK}.{{hostname}}'
508508
- 'traefik.http.routers.${STACK}__webhooks.entrypoints=web,websecure'
509-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
509+
- 'traefik.docker.network=dependencies_internal_net
510510
- 'traefik.http.middlewares.${STACK}__webhooks.headers.customresponseheaders.Pragma=no-cache'
511511
- 'traefik.http.middlewares.${STACK}__webhooks.headers.customresponseheaders.Cache-control=no-store'
512512
- 'traefik.http.middlewares.${STACK}__webhooks.headers.customresponseheaders.X-Robots-Tag=none'
@@ -516,7 +516,7 @@ services:
516516
replicas: 1
517517
networks:
518518
- {{STACK}}_app_net
519-
- dependencies_{{STACK}}_dependencies_net
519+
- dependencies_internal_net
520520
logging:
521521
driver: gelf
522522
options:
@@ -557,7 +557,7 @@ services:
557557
- 'traefik.http.routers.${STACK}__config.tls.domains[0].main=${STACK}.{{hostname}}'
558558
- 'traefik.http.routers.${STACK}__config.tls.domains[0].sans=*.${STACK}.{{hostname}}'
559559
- 'traefik.http.routers.${STACK}__config.entrypoints=web,websecure'
560-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
560+
- 'traefik.docker.network=dependencies_internal_net
561561
- 'traefik.http.middlewares.${STACK}__config.headers.customresponseheaders.Pragma=no-cache'
562562
- 'traefik.http.middlewares.${STACK}__config.headers.customresponseheaders.Cache-control=no-store'
563563
- 'traefik.http.middlewares.${STACK}__config.headers.customresponseheaders.X-Robots-Tag=none'
@@ -570,7 +570,7 @@ services:
570570
replicas: 1
571571
networks:
572572
- {{STACK}}_app_net
573-
- dependencies_{{STACK}}_dependencies_net
573+
- dependencies_internal_net
574574
logging:
575575
driver: gelf
576576
options:
@@ -600,7 +600,7 @@ services:
600600
- COUNTRY_CONFIG_URL=http://countryconfig.{{STACK}}_{{STACK}}_app_net:3040
601601
networks:
602602
- {{STACK}}_app_net
603-
- dependencies_{{STACK}}_dependencies_net
603+
- dependencies_internal_net
604604
logging:
605605
driver: gelf
606606
options:
@@ -619,7 +619,7 @@ services:
619619
- 'traefik.enable=false'
620620
networks:
621621
- {{STACK}}_app_net
622-
- dependencies_{{STACK}}_dependencies_net
622+
- dependencies_internal_net
623623
logging:
624624
driver: gelf
625625
options:
@@ -659,7 +659,7 @@ services:
659659
condition: on-failure
660660
networks:
661661
- {{STACK}}_app_net
662-
- dependencies_{{STACK}}_dependencies_net
662+
- dependencies_internal_net
663663
logging:
664664
driver: gelf
665665
options:
@@ -694,7 +694,7 @@ services:
694694
- NOTIFICATION_MONGODB_PASSWORD=${NOTIFICATION_MONGODB_PASSWORD}
695695
networks:
696696
- {{STACK}}_app_net
697-
- dependencies_{{STACK}}_dependencies_net
697+
- dependencies_internal_net
698698
logging:
699699
driver: gelf
700700
options:
@@ -709,7 +709,7 @@ services:
709709
- /opt/opencrvs/infrastructure/metabase/metabase.init.db.sql:/metabase.init.db.sql
710710
networks:
711711
- {{STACK}}_app_net
712-
- dependencies_{{STACK}}_dependencies_net
712+
- dependencies_internal_net
713713
environment:
714714
- QA_ENV=true
715715
- HOST=0.0.0.0
@@ -737,7 +737,7 @@ services:
737737
- 'traefik.http.routers.${STACK}__metabase.tls.domains[0].main=${STACK}.{{hostname}}'
738738
- 'traefik.http.routers.${STACK}__metabase.tls.domains[0].sans=*.${STACK}.{{hostname}}'
739739
- 'traefik.http.routers.${STACK}__metabase.entrypoints=web,websecure'
740-
- 'traefik.docker.network=dependencies_{{STACK}}_dependencies_net'
740+
- 'traefik.docker.network=dependencies_internal_net
741741
- 'traefik.http.middlewares.${STACK}__metabase.headers.customresponseheaders.Pragma=no-cache'
742742
- 'traefik.http.middlewares.${STACK}__metabase.headers.customresponseheaders.Cache-control=no-store'
743743
- 'traefik.http.middlewares.${STACK}__metabase.headers.customresponseheaders.X-Robots-Tag=none'
@@ -761,7 +761,7 @@ configs:
761761
mongo-on-deploy.{{ts}}:
762762
file: /opt/opencrvs/infrastructure/mongodb/on-deploy.sh
763763
networks:
764-
dependencies_{{STACK}}_dependencies_net:
764+
dependencies_internal_net:
765765
external: true
766766
{{STACK}}_app_net:
767767
driver: overlay

0 commit comments

Comments
 (0)