Merge branch 'master' of github.com:openeventdatabase/backend

Dockerfile

@@ -1,8 +1,15 @@
 FROM ubuntu:15.10
-WORKDIR /app
+WORKDIR /setup
 RUN apt-get update
 RUN apt-get install -y postgresql-9.4
 RUN apt-get install -y postgresql-server-dev-9.4
 RUN apt-get install -y postgis
 RUN apt-get install -y python3-dev
 RUN apt-get install -y python3-pip
+RUN pip3 install --system uwsgi
+ADD /setup* /setup/
+ADD /requirements.txt /setup/
+USER postgres
+RUN service postgresql start && /setup/setup.sh
+WORKDIR /app
+CMD service postgresql start && uwsgi --http :8080 --wsgi-file backend.py --callable app

requirements.txt

@@ -1,4 +1,3 @@
 falcon
 psycopg2
 uuid
-

setup.sh

@@ -1,2 +1,3 @@
-pip install -r requirements.sh
-psql < setup.sql
+pip3 install -r requirements.txt
+createdb oedb
+psql oedb < setup.sql