Include docker compose to handle kpi db services. Pip install jwt pac…

…kage within kpi web docker container. Comment out mongo and postgres db wait docker scripts

Dockerfile

@@ -73,7 +73,7 @@ COPY . "${KPI_SRC_DIR}"
 RUN virtualenv "$VIRTUAL_ENV"
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 RUN pip install  --quiet --upgrade pip && \
-    pip install  --quiet pip-tools
+    pip install  --quiet pip-tools && pip install jwt
 COPY ./dependencies/pip/external_services.txt /srv/tmp/pip_dependencies.txt
 RUN pip-sync /srv/tmp/pip_dependencies.txt 1>/dev/null && \
     rm -rf ~/.cache/pip

docker-compose.yml

@@ -0,0 +1,37 @@
+version: '2.2'
+
+services:
+  kpi_db:
+    image: postgis/postgis:9.6-3.0
+    environment:
+      - POSTGRES_PASSWORD=kpi
+      - POSTGRES_USER=kpi
+      - POSTGRES_DB=kpi
+    volumes:
+      # One level above the code to prevent having to move or delete
+      # it everytime we rebuild.
+      - /var/lib/postgresql/data
+  onadata_db:
+    image: postgis/postgis:9.6-3.0
+    environment:
+      - POSTGRES_PASSWORD=onadata
+      - POSTGRES_USER=onadata
+      - POSTGRES_DB=onadata
+    volumes:
+      # One level above the code to prevent having to move or delete
+      # it everytime we rebuild.
+      - /var/lib/postgresql/data
+  web:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: kpi:latest
+    ports:
+      - "8000:8000"
+    depends_on:
+      - kpi_db
+      - onadata_db
+    environment:
+      - DATABASE_URL=postgres://db:5432/kpi
+    volumes:
+      - .:/srv/src/kpi 

docker/init.bash

@@ -15,8 +15,8 @@ fi
 
 
 # Wait for databases to be up & running before going further
-/bin/bash "${INIT_PATH}/wait_for_mongo.bash"
-/bin/bash "${INIT_PATH}/wait_for_postgres.bash"
+# /bin/bash "${INIT_PATH}/wait_for_mongo.bash"
+# /bin/bash "${INIT_PATH}/wait_for_postgres.bash"
 
 echo 'Running migrations...'
 python manage.py migrate --noinput