github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade build-scripts to 3.4.0

Browse source 
This version fixes docker-compose health checks for dependent services. See
https://github.com/overleaf/dev-environment/pull/409 for details.
This commit is contained in:
Eric Mc Sween 2020-11-23 10:56:33 -05:00
parent 3564dc0140
commit ed1e192d2e
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/document-updater/buildscript.txt
View file

@ -5,4 +5,4 @@ document-updater
--env-pass-through= --env-pass-through=
--node-version=10.22.1 --node-version=10.22.1
--public-repo=True --public-repo=True
--script-version=3.3.4 --script-version=3.4.0

9
services/document-updater/docker-compose.ci.yml
View file

@ -20,6 +20,7 @@ services:
environment: environment:
ELASTIC_SEARCH_DSN: es:9200 ELASTIC_SEARCH_DSN: es:9200
REDIS_HOST: redis REDIS_HOST: redis
QUEUES_REDIS_HOST: redis
MONGO_HOST: mongo MONGO_HOST: mongo
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP} MOCHA_GREP: ${MOCHA_GREP}
@ -43,6 +44,14 @@ services:
user: root user: root
redis: redis:
image: redis image: redis
healthcheck:
test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
interval: 1s
retries: 20
mongo: mongo:
image: mongo:4.0 image: mongo:4.0
healthcheck:
test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
interval: 1s
retries: 20

9
services/document-updater/docker-compose.yml
View file

@ -25,6 +25,7 @@ services:
environment: environment:
ELASTIC_SEARCH_DSN: es:9200 ELASTIC_SEARCH_DSN: es:9200
REDIS_HOST: redis REDIS_HOST: redis
QUEUES_REDIS_HOST: redis
MONGO_HOST: mongo MONGO_HOST: mongo
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
MOCHA_GREP: ${MOCHA_GREP} MOCHA_GREP: ${MOCHA_GREP}
@ -41,7 +42,15 @@ services:
redis: redis:
image: redis image: redis
healthcheck:
test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
interval: 1s
retries: 20
mongo: mongo:
image: mongo:4.0 image: mongo:4.0
healthcheck:
test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
interval: 1s
retries: 20