SNO2-41-fix-docker-compose-race-condition (#868)

Author: keenangraham

.circleci/config.yml

@@ -95,7 +95,7 @@ jobs:
       - run:
           name: Upload coverage
           command: |
-              docker-compose run --no-deps -e COVERALLS_REPO_TOKEN=$COVERALLS_REPO_TOKEN pyramid coveralls
+              docker-compose run --no-deps --entrypoint "/bin/bash" -e COVERALLS_REPO_TOKEN=$COVERALLS_REPO_TOKEN pyramid -c "git config --global --add safe.directory /igvfd && coveralls"
       - store_test_results:
           path: test-results
 

docker-compose.test-indexer.yml

@@ -61,6 +61,7 @@ services:
       - ".:/igvfd"
       - "/igvfd/src/igvfd.egg-info"
       - "/igvfd/src/igvfd/static"
+    entrypoint: ./docker/wait-for-local-services-entrypoint.sh
     command: /scripts/pyramid/run-development.sh
     ports:
       - "6543:6543"
@@ -92,6 +93,9 @@ services:
       - TRANSACTION_QUEUE_URL=http://localstack:4566/000000000000/transaction-queue
       - INVALIDATION_QUEUE_URL=http://localhost:4566/000000000000/invalidation-queue
       - RESOURCES_INDEX=snovault-resources
+    volumes:
+       - "./docker/wait-for-local-services-entrypoint.sh:/snovault-index/wait-for-local-services-entrypoint.sh"
+    entrypoint: ./wait-for-local-services-entrypoint.sh
     command: run-invalidation-service
     depends_on:
       - postgres
@@ -111,6 +115,9 @@ services:
       - BACKEND_KEY=foobar
       - BACKEND_SECRET_KEY=bazqux
       - RESOURCES_INDEX=snovault-resources
+    volumes:
+       - "./docker/wait-for-local-services-entrypoint.sh:/snovault-index/wait-for-local-services-entrypoint.sh"
+    entrypoint: ./wait-for-local-services-entrypoint.sh
     command: run-indexing-service
     depends_on:
       - postgres
@@ -148,6 +155,7 @@ services:
       - ".:/igvfd"
       - "/igvfd/src/igvfd.egg-info"
       - "/igvfd/src/igvfd/static"
+    entrypoint: ./docker/wait-for-local-services-entrypoint.sh
     command: pytest -rf --cov=igvfd -s -o junit_family=legacy --junitxml=./.test-results/junit.xml --cov-append -m 'indexing'
     depends_on:
       - postgres

docker-compose.yml

@@ -61,6 +61,7 @@ services:
       - ".:/igvfd"
       - "/igvfd/src/igvfd.egg-info"
       - "/igvfd/src/igvfd/static"
+    entrypoint: ./docker/wait-for-local-services-entrypoint.sh
     command: /scripts/pyramid/run-create-mapping.sh
     depends_on:
       - postgres
@@ -82,6 +83,7 @@ services:
       - ".:/igvfd"
       - "/igvfd/src/igvfd.egg-info"
       - "/igvfd/src/igvfd/static"
+    entrypoint: ./docker/wait-for-local-services-entrypoint.sh
     command: load-development
     depends_on:
       - create-mapping
@@ -104,6 +106,7 @@ services:
       - ".:/igvfd"
       - "/igvfd/src/igvfd.egg-info"
       - "/igvfd/src/igvfd/static"
+    entrypoint: ./docker/wait-for-local-services-entrypoint.sh
     command: /scripts/pyramid/run-development.sh
     ports:
       - "6543:6543"
@@ -133,6 +136,9 @@ services:
       - TRANSACTION_QUEUE_URL=http://localstack:4566/000000000000/transaction-queue
       - INVALIDATION_QUEUE_URL=http://localhost:4566/000000000000/invalidation-queue
       - RESOURCES_INDEX=snovault-resources
+    volumes:
+       - "./docker/wait-for-local-services-entrypoint.sh:/snovault-index/wait-for-local-services-entrypoint.sh"
+    entrypoint: ./wait-for-local-services-entrypoint.sh
     command: run-invalidation-service
     depends_on:
       - pyramid
@@ -149,6 +155,9 @@ services:
       - BACKEND_KEY=foobar
       - BACKEND_SECRET_KEY=bazqux
       - RESOURCES_INDEX=snovault-resources
+    volumes:
+       - "./docker/wait-for-local-services-entrypoint.sh:/snovault-index/wait-for-local-services-entrypoint.sh"
+    entrypoint: ./wait-for-local-services-entrypoint.sh
     command: run-indexing-service
     depends_on:
       - pyramid

docker/wait-for-local-services-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+while ! curl -s http://localstack:4566/_localstack/init | grep -q '\"READY\": true'; do
+    echo 'Waiting for Localstack to become ready...';
+    sleep 5;
+    done;
+echo 'Localstack is ready.';
+while ! curl -s http://opensearch:9200 | grep -q '\"cluster_name\"'; do
+    echo 'Waiting for Opensearch to become ready...';
+    sleep 5;
+    done;
+echo 'Opensearch is ready.';
+
+exec "$@"