Merge pull request #186 from CodeForPhilly/180

Fix for 180: missing  pdp_user_roles table

Author: c-simpson

src/docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - postgres:/var/lib/postgresql/data
     environment:
       POSTGRES_PASSWORD: thispasswordisverysecure
+      POSTGRES_DB: paws
 
   server:
     container_name: paws-compose-server
@@ -23,7 +24,6 @@ services:
     environment: 
       FLASK_ENV: development
 
-
   client:
     build: ./client
     container_name: paws-compose-client
@@ -35,8 +35,12 @@ services:
       - CHOKIDAR_USEPOLLING=true
     stdin_open: true
 
+
 #using named volumes fixs a windows docker bug relating to container permissions
 #https://stackoverflow.com/questions/49148754/docker-container-shuts-down-giving-data-directory-has-wrong-ownership-error-wh
 volumes:
   postgres:
-  src_archive:
+  src_archive:
+
+
+

src/server/Dockerfile

@@ -39,4 +39,6 @@ WORKDIR /app
 
 RUN set FLASK_APP=server/app.py
 RUN export FLASK_APP
-CMD alembic upgrade head ; python -m flask run --host=0.0.0.0
+
+# This abomination ensures that the PG server has finished its restart cycle
+CMD echo "SLEEPING 10"; sleep 10; echo "WAKING"; alembic upgrade head ; python -m flask run --host=0.0.0.0