github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 05:13:43 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #137 from overleaf/em-docker-compose-healthchecks

Browse source 
Upgrade build-scripts to 3.4.0
This commit is contained in:
Eric Mc Sween 2020-11-26 11:19:25 -05:00 committed by GitHub
commit 71bb9a5832
3 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/filestore/buildscript.txt
View file

@ -6,4 +6,4 @@ filestore
--env-pass-through= --env-pass-through=
--node-version=12.18.4 --node-version=12.18.4
--public-repo=True --public-repo=True
--script-version=3.3.4 --script-version=3.4.0

18
services/filestore/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
AWS_S3_ENDPOINT: http://s3:9090 AWS_S3_ENDPOINT: http://s3:9090
@ -58,12 +59,17 @@ services:
command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
user: root user: root
s3: s3:
build: image: adobe/s3mock
context: test/acceptance/deps
dockerfile: Dockerfile.s3mock
environment: environment:
- initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket
healthcheck:
test: wget --quiet --output-document=/dev/null http://localhost:9090
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

18
services/filestore/docker-compose.yml
View file

@ -29,6 +29,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
AWS_S3_ENDPOINT: http://s3:9090 AWS_S3_ENDPOINT: http://s3:9090
@ -60,12 +61,17 @@ services:
command: npm run --silent test:acceptance command: npm run --silent test:acceptance
s3: s3:
build: image: adobe/s3mock
context: test/acceptance/deps
dockerfile: Dockerfile.s3mock
environment: environment:
- initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket
healthcheck:
test: wget --quiet --output-document=/dev/null http://localhost:9090
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