use postgresql in docker image, update docker doc

diff --git a/Dockerfile b/Dockerfile
index 03b9fe7f3700d69023aef3104d334c5154a56074..6dd69e072fd6ea16c7ffbb47f503d678d1112b7c 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,18 +19,11 @@ maintainer Guillaume Pellerin <yomguy@parisson.com>
 
 # install confs, keys and deps
 add ./deploy/apt-app.list /etc/apt/sources.list.d/
+run apt-key adv --keyserver pgpkeys.mit.edu --recv-keys E3298399DF14BB7C
+run apt-key adv --keyserver pgpkeys.mit.edu --recv-keys 07DC563D1F41B907
 run apt-get update
-run apt-get install -y apt-utils
-run gpg --keyserver pgpkeys.mit.edu --recv-key E3298399DF14BB7C
-run gpg -a --export E3298399DF14BB7C | apt-key add -
-run gpg --keyserver pgpkeys.mit.edu --recv-key 07DC563D1F41B907
-run gpg -a --export 07DC563D1F41B907 | apt-key add -
-run apt-get update
-run apt-get upgrade -y --force-yes
-run apt-get install -y --force-yes build-essential vim
-run apt-get install -y python python-dev python-pip
-run apt-get -y -t wheezy-backports dist-upgrade
-run apt-get install -y --force-yes -t wheezy-backports nginx supervisor python-timeside git python-tables python-traits python-networkx ipython python-numexpr gstreamer0.10-alsa
+run apt-get -y --force-yes -t wheezy-backports dist-upgrade
+run apt-get install -y --force-yes -t wheezy-backports build-essential vim python python-dev python-pip nginx postgresql python-psycopg2 supervisor python-timeside git python-tables python-traits python-networkx ipython python-numexpr gstreamer0.10-alsa
 run apt-get clean
 
 # install tools via pip
@@ -39,6 +32,13 @@ run pip install uwsgi ipython
 # clone app
 add . /opt/TimeSide
 
+# setup postgresql DB
+run /etc/init.d/postgresql start
+user postgres
+run psql --command "CREATE USER docker WITH SUPERUSER PASSWORD 'docker';"
+run createdb -O docker docker
+user root
+
 # setup all the configfiles
 run echo "daemon off;" >> /etc/nginx/nginx.conf
 run rm /etc/nginx/sites-enabled/default

diff --git a/README.rst b/README.rst
index 905825ebb9273cc49791626d4e8641af24f2673b..339dd091fbab021972b2c2c9065e58f583bf9ece 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -351,32 +351,31 @@ Development
 Docker (recommended)
 --------------------
 
-Docker is a great tool for developping and deploying processing environments! Our docker container includes all the necessary packages and environments for development and production with TimeSide.
+Docker is a great tool for developing and deploying processing environments. We provide a docker image which contains TimeSide and all the necessary packages (nginx, uwsgi, etc) to run it either in development or in production stages.
 
 First, install Docker: https://docs.docker.com/installation/
 
-Then, simply pull our dev image and run::
+Then, simply pull the image and run it::
 
-  sudo docker pull parisson/timeside
-  sudo docker run parisson/timeside
+  docker pull parisson/timeside
+  docker run -p 9000:80 parisson/timeside
 
-To get a shell::
+You can now browse the TimeSide API: http://localhost:9000/api/
 
-  sudo docker run -ti parisson/timeside bash
+or get a shell session::
 
-More infos: https://registry.hub.docker.com/u/parisson/timeside/
+  docker run -ti parisson/timeside bash
 
-To start the web server through the container::
+To start a new development, it is advised to checkout the dev branch in the container::
 
-  sudo docker run -p 9000:80 parisson/timeside
+  cd /opt/TimeSide
+  git checkout dev
 
-Finally browse http://localhost:9000/api/
+or get our latest-dev image::
 
-To start a new development, it is advised to checkout the dev branch and build your own container::
+  docker pull parisson/timeside:latest-dev
 
-  sudo docker run -ti parisson/timeside bash
-  cd /opt/TimeSide
-  git checkout dev
+More infos: https://registry.hub.docker.com/u/parisson/timeside/
 
 
 VirtualBox and Vagrant (deprecated)

diff --git a/deploy/supervisor-app.conf b/deploy/supervisor-app.conf
index 4478893f7c6a6a5b766c343cf34799ef43da619b..b0f52ad58baff8d9a4f114cfbca7e859cf1291ed 100644 (file)
--- a/deploy/supervisor-app.conf
+++ b/deploy/supervisor-app.conf
@@ -1,5 +1,9 @@
+[program:postgresql-app]
+command = postgresql -D /var/lib/postgresql/9.1/main -c config_file=/etc/postgresql/9.1/main/postgresql.conf
+
 [program:app-uwsgi]
 command = /usr/local/bin/uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini
 
 [program:nginx-app]
 command = /usr/sbin/nginx
+

diff --git a/doc/source/dev.rst b/doc/source/dev.rst
index de0de7e0a1382839abd16a55eeba03614373b339..8ce6fda7e1520b702a29828721dbf16a676d6d65 100644 (file)
--- a/doc/source/dev.rst
+++ b/doc/source/dev.rst
@@ -13,32 +13,31 @@ Development
 Docker (recommended)
 --------------------
 
-Docker is a great tool for developping and deploying processing environments! Our docker container includes all the necessary packages and environments for development and production with TimeSide.
+Docker is a great tool for developing and deploying processing environments. We provide a docker image which contains TimeSide and all the necessary packages (nginx, uwsgi, etc) to run it either in development or in production stages.
 
 First, install Docker: https://docs.docker.com/installation/
 
-Then, simply pull our dev image and run::
+Then, simply pull the image and run it::
 
-  sudo docker pull parisson/timeside
-  sudo docker run parisson/timeside
+  docker pull parisson/timeside
+  docker run -p 9000:80 parisson/timeside
 
-To get a shell::
+You can now browse the TimeSide API: http://localhost:9000/api/
 
-  sudo docker run -ti parisson/timeside bash
+or get a shell session::
 
-More infos: https://registry.hub.docker.com/u/parisson/timeside/
+  docker run -ti parisson/timeside bash
 
-To start the web server through the container::
+To start a new development, it is advised to checkout the dev branch in the container::
 
-  sudo docker run -p 9000:80 parisson/timeside
+  cd /opt/TimeSide
+  git checkout dev
 
-Finally browse http://localhost:9000/api/
+or get our latest-dev image::
 
-To start a new development, it is advised to checkout the dev branch and build your own container::
+  docker pull parisson/timeside:latest-dev
 
-  sudo docker run -ti parisson/timeside bash
-  cd /opt/TimeSide
-  git checkout dev
+More infos: https://registry.hub.docker.com/u/parisson/timeside/
 
 
 VirtualBox and Vagrant (deprecated)

diff --git a/examples/sandbox/settings.py b/examples/sandbox/settings.py
index 8bcd4528ba60db3f34191ec636da894a7882964f..3aba7f16619a415bfd41559564441022ce44c379 100644 (file)
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@ -17,10 +17,10 @@ PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': PROJECT_ROOT + os.sep + 'timeside.sql', # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
+        'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'docker', # Or path to database file if using sqlite3.
+        'USER': 'docker',                      # Not used with sqlite3.
+        'PASSWORD': 'docker',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }