From 26710f346d3e9ec39dca201c7e181de52b0cecdd Mon Sep 17 00:00:00 2001 From: Laurent Bossavit Date: Fri, 29 Apr 2016 16:33:15 +0200 Subject: [PATCH] Improve Docker setup --- Dockerfile | 9 ++++++++- requirements.txt | 1 - setup.sh | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) mode change 100644 => 100755 setup.sh diff --git a/Dockerfile b/Dockerfile index 1a75331..2ff707c 100644 --- a/Dockerfile +++ b/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 diff --git a/requirements.txt b/requirements.txt index ee927eb..f3a632b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ falcon psycopg2 uuid - diff --git a/setup.sh b/setup.sh old mode 100644 new mode 100755 index ad268e0..36301d8 --- a/setup.sh +++ b/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