Add docker healthy status waiting to fix test failures

Dockerfile

@@ -7,4 +7,7 @@ RUN pip install -r requirements.txt
 
 ADD . .
 
+HEALTHCHECK --interval=5s --timeout=5s --retries=15\
+    CMD curl -f http://localhost || exit 1
+
 ENTRYPOINT ["python", "server.py"]

dashboard/app.py

@@ -16,7 +16,7 @@
 )
 from werkzeug.contrib.cache import SimpleCache
 from dashboard.helpers import get_week_range
-from flask import Flask, render_template, request, abort
+from flask import Flask, render_template, request, abort, jsonify
 from datetime import datetime
 from models import db
 import settings
@@ -184,6 +184,11 @@ def sessions_country():
     )
 
 
+@app.route('/ping')
+def ping():
+    return jsonify({'status': 'ok'})
+
+
 def init_db(custom_config=None):
     if custom_config is not None:
         app.config['SQLALCHEMY_DATABASE_URI'] =\

docker-compose.yml

@@ -18,6 +18,11 @@ services:
       - .:/code
     depends_on:
       - db
+    healthcheck:
+      test: curl -f http://localhost
+      interval: 5s
+      timeout: 5s
+      retries: 15
 
   dashboard:
     build:
@@ -32,11 +37,15 @@ services:
       DB_NAME: myst_api
       DB_USER: myst_api
       DB_PASSWORD: myst_api
-
     volumes:
       - .:/code
     depends_on:
       - db
+    healthcheck:
+      test: curl -f http://localhost/ping
+      interval: 5s
+      timeout: 5s
+      retries: 15
 
   db:
     image: percona:5.7
@@ -49,3 +58,8 @@ services:
       MYSQL_DATABASE: myst_api
       MYSQL_USER: myst_api
       MYSQL_PASSWORD: myst_api
+    healthcheck:
+      test: mysqladmin ping --silent
+      interval: 5s
+      timeout: 5s
+      retries: 15

tests/docker-compose.yml

@@ -7,7 +7,6 @@ services:
       dockerfile: Dockerfile
     container_name: mysterium-api-test
     environment:
-      APP_PORT: 80
       DB_HOST: mysterium-mysql-test
       DB_NAME: myst_api
       DB_USER: myst_api
@@ -16,6 +15,11 @@ services:
       - ..:/code
     depends_on:
       - db
+    healthcheck:
+      test: curl -f http://localhost
+      interval: 5s
+      timeout: 5s
+      retries: 15
 
   db:
     image: percona:5.7
@@ -27,3 +31,8 @@ services:
       MYSQL_DATABASE: myst_api
       MYSQL_USER: myst_api
       MYSQL_PASSWORD: myst_api
+    healthcheck:
+      test: mysqladmin ping --silent
+      interval: 5s
+      timeout: 5s
+      retries: 15

tests/run_tests

@@ -1,8 +1,15 @@
 #!/bin/sh
 
 (cd tests; docker-compose up --build -d)
-printf "Sleeping for 10s until everything initializes...\n"
-sleep 10
+
+printf "Waiting until db initializes..."
+until [ "` (docker inspect $(cd tests; docker-compose ps -q db) -f {{.State.Health.Status}})`" == "healthy" ]; do
+    printf "."
+    sleep 1
+done;
+sleep 3 # needed for db to fully initialize
+printf "\n"
+
 (cd tests; docker-compose exec api bin/db-upgrade)
 
 DISABLE_LOGS=1 bin/test