From 96126ecf34baaeabeba2e1eba6124b9f6d8e4070 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Mon, 23 Nov 2020 10:56:33 -0500 Subject: [PATCH] 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. --- services/real-time/buildscript.txt | 2 +- services/real-time/docker-compose.ci.yml | 5 +++++ services/real-time/docker-compose.yml | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 35e4f6c9aa..f75047baec 100644 --- a/services/real-time/buildscript.txt +++ b/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 diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml index 255a6b77a6..4e90129f69 100644 --- a/services/real-time/docker-compose.ci.yml +++ b/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 diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index 1347882d70..eac74fbee2 100644 --- a/services/real-time/docker-compose.yml +++ b/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