Просмотр исходного кода

Upgrade build-scripts to 3.4.0

This version fixes docker-compose health checks for dependent services. See
https://github.com/overleaf/dev-environment/pull/409 for details.
Eric Mc Sween 5 лет назад
Родитель
Сommit
e3c1854eb4

+ 1 - 1
services/chat/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 
-<!-- Please review https://github.com/overleaf/write_latex/blob/master/.github/CONTRIBUTING.md for guidance on what is expected in each section. -->
+<!-- Please review https://github.com/overleaf/developer-manual/blob/master/code/pr-guidance.md for guidance on what is expected in each section. -->
 
 ### Description
 

+ 1 - 1
services/chat/buildscript.txt

@@ -5,4 +5,4 @@ chat
 --env-pass-through=
 --node-version=10.22.1
 --public-repo=False
---script-version=3.3.4
+--script-version=3.4.0

+ 5 - 0
services/chat/docker-compose.ci.yml

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

+ 5 - 0
services/chat/docker-compose.yml

@@ -25,6 +25,7 @@ services:
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
+      QUEUES_REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
       MOCHA_GREP: ${MOCHA_GREP}
@@ -39,4 +40,8 @@ services:
 
   mongo:
     image: mongo:4.0
+    healthcheck:
+      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      interval: 1s
+      retries: 20