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 6dd15ceb16
commit f472594819
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/docstore/buildscript.txt
View file

@ -5,4 +5,4 @@ docstore
--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.5 --script-version=3.4.0

14
services/docstore/docker-compose.ci.yml
View file

@ -23,6 +23,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
GCS_API_ENDPOINT: gcs:9090 GCS_API_ENDPOINT: gcs:9090
@ -50,7 +51,14 @@ services:
user: root user: root
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
gcs: gcs:
build: image: fsouza/fake-gcs-server
context: test/acceptance/deps command: ["--port=9090", "--scheme=http"]
dockerfile: Dockerfile.fake-gcs healthcheck:
test: wget --quiet --output-document=/dev/null http://localhost:9090/storage/v1/b
interval: 1s
retries: 20

14
services/docstore/docker-compose.yml
View file

@ -28,6 +28,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
GCS_API_ENDPOINT: gcs:9090 GCS_API_ENDPOINT: gcs:9090
@ -48,8 +49,15 @@ services:
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
gcs: gcs:
build: image: fsouza/fake-gcs-server
context: test/acceptance/deps command: ["--port=9090", "--scheme=http"]
dockerfile: Dockerfile.fake-gcs healthcheck:
test: wget --quiet --output-document=/dev/null http://localhost:9090/storage/v1/b
interval: 1s
retries: 20