Przeglądaj źródła

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 lat temu
rodzic
commit
96126ecf34

+ 1 - 1
services/real-time/buildscript.txt

@@ -5,4 +5,4 @@ real-time
 --env-pass-through=
 --node-version=10.22.1
 --public-repo=True
---script-version=3.3.5
+--script-version=3.4.0

+ 5 - 0
services/real-time/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,4 +42,8 @@ services:
     user: root
   redis:
     image: redis
+    healthcheck:
+      test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
+      interval: 1s
+      retries: 20
 

+ 5 - 0
services/real-time/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:
 
   redis:
     image: redis
+    healthcheck:
+      test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
+      interval: 1s
+      retries: 20