Merge branch 'dev' into feature/mysql

Conflicts:
	Dockerfile
	docker-compose.yml

diff --cc Dockerfile
index ff9af7f6d08a54777517fab10625b2b39930ea72,5d5b91c15dedfabb89c9ab78fdb0c66cb8ce1352..b090fe4c49ff64365de1e42ebcdfc670566d8926
--- 1/Dockerfile
--- 2/Dockerfile
+++ b/Dockerfile
@@@ -19,24 -19,21 +19,35 @@@ MAINTAINER Guillaume Pellerin <yomguy@p
  
  # install confs, keys and deps
  RUN apt-key adv --keyserver pgp.mit.edu --recv-key E3298399DF14BB7C && \
++<<<<<<< HEAD
 +    apt-key adv --keyserver pgp.mit.edu --recv-key 07DC563D1F41B907
 +    apt-key adv --keyserver pgp.mit.edu --recv-key 5C808C2B65558117
 +ADD ./examples/deploy/apt-app.list /etc/apt/sources.list.d/
 +RUN apt-get update && \
 +    apt-get install -y --force-yes python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-alsa vamp-examples libmysqlclient-dev
 +RUN apt-get -y --force-yes -t wheezy-backports dist-upgrade
 +RUN apt-get install -y --force-yes -t wheezy-backports  python-aubio python-yaafe
 +#RUN apt-get install -y --force-yes -t wheezy-backports build-essential vim python python-dev python-pip nginx postgresql python-psycopg2 supervisor git
 +RUN apt-get clean
 +
 +RUN apt-get update && apt-get install -y wget bzip2 build-essential
++=======
+     echo 'deb http://http.debian.net/debian wheezy-backports main contrib non-free' > /etc/apt/sources.list.d/wheezy-backports.list && \
+     echo 'deb http://debian.parisson.com/debian/ wheezy main' > /etc/apt/sources.list.d/parisson.list && \
+     apt-get update && \
+     apt-get -y --force-yes -t wheezy-backports dist-upgrade  && \
+     apt-get install -y --force-yes python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-alsa vamp-examples && \
+     apt-get install -y --force-yes -t wheezy-backports python-yaafe && \
+     apt-get install -y --force-yes wget bzip2 build-essential && \
+     apt-get clean
++>>>>>>> dev
  
  # Install conda in /opt/miniconda
+ ENV PATH /opt/miniconda/bin:$PATH
  RUN wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh && \
      bash miniconda.sh -b -p /opt/miniconda && \
-     rm miniconda.sh
- ENV PATH /opt/miniconda/bin:$PATH
- RUN hash -r && \
+     rm miniconda.sh && \
+     hash -r && \
      conda config --set always_yes yes --set changeps1 yes && \
      conda update -q conda
  

diff --cc docker-compose.yml
index 3a18cf27afb5848c4a0089a86de0b6970c18a5f4,9da2d60de9f95a9bd70f446fc43572e029adccac..07506a4f53c5db24f273cc4fe0177b2ac0ffdd73
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -1,9 -1,3 +1,5 @@@
- home:
-   image: debian:wheezy
-   volumes:
-     - ./examples/sandbox:/home/timeside
-   command: /bin/true
++# Volumes
 +
  static:
    image: debian:wheezy
    volumes:
@@@ -26,17 -20,11 +22,23 @@@ lib
      - /var/lib/mysql
    command: /bin/true
  
 -# db:
 -#   image: postgres
 -#   volumes_from:
 -#     - datadb
++home:
++  image: debian:wheezy
++  volumes:
++    - ./examples/sandbox:/home/timeside
++  command: /bin/true
 +
 +db:
 +  image: mysql
 +  volumes_from:
 +    - lib
 +    - log
 +  environment:
 +    - MYSQL_ROOT_PASSWORD=mysecretpassword
 +    - MYSQL_DATABASE=timeside
 +    - MYSQL_USER=timeside
 +    - MYSQL_PASSWORD=changeme
+ 
  rabbitmq:
    image: rabbitmq:3-management
    ports:
@@@ -44,23 -32,6 +46,23 @@@
    expose:
      - "5672"
  
-     - "8000" #default runserver wsgi port
 +app:
 +  build: .
 +  volumes:
 +    - .:/opt/TimeSide
 +  volumes_from:
 +    - static
 +    - home
 +    - log
 +  command: /bin/sh /opt/TimeSide/examples/deploy/start_app.sh
 +  ports:
 +    - "9000:9000"
 +  expose:
++    - "8000"
 +  links:
 +    - rabbitmq
 +    - db
 +
  worker:
    build: .
    volumes_from: