From ed1e192d2e66abbc171676e843359129bd8bea67 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <eric.mcsween@overleaf.com>
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/document-updater/buildscript.txt       | 2 +-
 services/document-updater/docker-compose.ci.yml | 9 +++++++++
 services/document-updater/docker-compose.yml    | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt
index afb9f89937..72b71fe987 100644
--- a/services/document-updater/buildscript.txt
+++ b/services/document-updater/buildscript.txt
@@ -5,4 +5,4 @@ document-updater
 --env-pass-through=
 --node-version=10.22.1
 --public-repo=True
---script-version=3.3.4
+--script-version=3.4.0
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index d56b0e1590..1a25b3bf15 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/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}
@@ -43,6 +44,14 @@ services:
     user: root
   redis:
     image: redis
+    healthcheck:
+      test: ping="$$(redis-cli ping)" && [ "$$ping" = 'PONG' ]
+      interval: 1s
+      retries: 20
 
   mongo:
     image: mongo:4.0
+    healthcheck:
+      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      interval: 1s
+      retries: 20
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index 6d513ec68f..4a16f5ecb1 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/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}
@@ -41,7 +42,15 @@ services:
 
   redis:
     image: redis
+    healthcheck:
+      test: ping=$$(redis-cli ping) && [ "$$ping" = 'PONG' ]
+      interval: 1s
+      retries: 20
 
   mongo:
     image: mongo:4.0
+    healthcheck:
+      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      interval: 1s
+      retries: 20