updates docker config to run tests with one flaky test

Author: tildeee

Dockerfile

@@ -10,6 +10,8 @@ RUN apt-get update && apt-get install -y \
     libssl-dev libffi-dev \
     --no-install-recommends
 
+RUN apt-get update && apt-get install -y postgresql-client
+
 # Create directory for app
 RUN mkdir /app
 

docker-compose.yaml

@@ -14,10 +14,10 @@ services:
 
   testenv:
     build: .
-    command: tail -f /dev/null
+    command: sh test.sh
     environment:
-      - SQLALCHEMY_TEST_DATABASE_URI=postgresql+psycopg2://postgres:postgres@localhost:5432/task_list_api_test
-      - NODE_ENV=test
+      - SQLALCHEMY_TEST_DATABASE_URI=postgresql://postgres:postgres@postgres:5432/task_list_api_test
+      - FLASK_ENV=test
     depends_on:
       postgres:
         condition: service_healthy

test.sh

@@ -1 +1,31 @@
+#!/bin/bash
+
+# must match the name of the service for the database in
+# the docker-compose.yml file
+DATABASE_SERVICE=postgres
+COUNTER=0
+EXIT_CODE=1
+SECONDS_BEFORE_TIMEOUT=59
+
+# check to see if script is running in docker
+if [ -f /.dockerenv ]; then
+
+    # spin until database is ready
+    while [ $EXIT_CODE -ne 0 ]
+    do
+      pg_isready -h $DATABASE_SERVICE
+      EXIT_CODE=$?
+      COUNTER=`expr $COUNTER + 1`
+
+      sleep 1
+
+      # Check for time out
+      if [ $COUNTER -ge $SECONDS_BEFORE_TIMEOUT ]; then
+        echo "Timed Out - Database not Found"
+        exit 1
+      fi
+
+    done
+fi
+
 pytest