From 093fe78c3aa82ca1052dabbdbd87746dbeea71d9 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/notifications/buildscript.txt | 2 +- services/notifications/docker-compose.ci.yml | 5 +++++ services/notifications/docker-compose.yml | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 336eb68a49..eed858e229 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -5,4 +5,4 @@ notifications --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/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 07b933fad2..47fcec0c68 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/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 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index 06741396c6..549aad4a0b 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/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