Dockerize kpi

Dockerfile

@@ -1,4 +1,5 @@
 FROM nikolaik/python-nodejs:python3.8-nodejs10
+ARG additional_pip_packages=pyjwt
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LANG=en_US.UTF-8
@@ -76,6 +77,7 @@ RUN pip install  --quiet --upgrade pip && \
     pip install  --quiet pip-tools
 COPY ./dependencies/pip/external_services.txt /srv/tmp/pip_dependencies.txt
 RUN pip-sync /srv/tmp/pip_dependencies.txt 1>/dev/null && \
+    pip install ${additional_pip_packages} && \
     rm -rf ~/.cache/pip
 
 ###########################

docker-compose.yml

@@ -0,0 +1,41 @@
+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.
+      - ../.kpi_db:/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.
+      - ../.onadata_db:/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://kpi_db:5432/kpi
+      - DJANGO_SETTINGS_MODULE=kobo.settings.local_settings
+      - KPI_SRC_DIR=/srv/src/kpi
+      - KPI_LOGS_DIR=/srv/logs
+      - KPI_PREFIX=kpi
+    volumes:
+      - .:/srv/src/kpi

docker/init.bash

@@ -3,6 +3,9 @@ set -e
 
 source /etc/profile
 
+# Have web service wait until db services are ready to accept connections
+sleep 1
+
 echo 'KoBoForm initializing...'
 
 cd "${KPI_SRC_DIR}"
@@ -18,7 +21,10 @@ fi
 /bin/bash "${INIT_PATH}/wait_for_mongo.bash"
 /bin/bash "${INIT_PATH}/wait_for_postgres.bash"
 
+
 echo 'Running migrations...'
+python manage.py makemigrations --merge --noinput
+python manage.py makemigrations --noinput
 python manage.py migrate --noinput
 
 echo 'Creating superuser...'
@@ -65,4 +71,9 @@ rm -rf /tmp/celery*.pid
 
 echo 'KoBoForm initialization completed.'
 
+# Have kpi service accessible on the browser
+source /opt/venv/bin/activate
+cd /srv/src/kpi
+python manage.py runserver 0.0.0.0:8000
+
 exec /usr/bin/runsvdir /etc/service