Force lib volume decomposition, update docker doc

diff --git a/README.rst b/README.rst
index fc14fb783458bd1f41a7f2e0db2519b62ade253f..d3dd7e924fd102874730ee4a4173d10a9bfef260 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -229,41 +229,36 @@ API / Documentation
 * Notebooks : http://nbviewer.ipython.org/github/thomasfillon/Timeside-demos/tree/master/
 * Example : http://archives.crem-cnrs.fr/archives/items/CNRSMH_E_2004_017_001_01/
 
+
 Install
 =======
 
 Any platform
 --------------
 
-Thanks to Docker, TimeSide is now fully available as a docker image ready to work. The image includes all the necessary applications, modules and volumes to start your project in 5 minutes:
-
-    1. install `Git <http://git-scm.com/downloads>`_
-
-    2. install `Docker <https://docs.docker.com/installation/>`_
-
-    3. install `docker-compose <https://docs.docker.com/compose/install/>`_
-
-    4. clone TimeSide::
+Thanks to Docker, TimeSide is now fully available as a docker image ready to work. The image includes all the necessary applications, modules and volumes to start your project in a few minutes.
 
-        git clone https://github.com/Parisson/TimeSide.git
-        cd TimeSide
+First install `Git <http://git-scm.com/downloads>`_, `Docker <https://docs.docker.com/installation/>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_, then copy these commands in a terminal and hit ENTER::
 
-    5. start it up::
+    git clone https://github.com/Parisson/TimeSide.git
+    cd TimeSide
+    docker-compose up
 
-        docker-compose up
+That's it! You can now browse the TimeSide API: http://localhost:8000/api/
 
-That's it! You can now browse the TimeSide API browsing http://localhost:8000/api/
+and the admin: http://localhost:8000/admin (admin/admin)
 
-To process data by hand, you can also start a python shell session into the sandbox::
+To process some data by hand, you can also start a python shell session into the sandbox::
 
     docker-compose run app python examples/sandbox/manage.py shell
 
-To build your project on top of TimeSide, just pull our latest master image::
+To build your own audido project on top of TimeSide, just pull our latest master image::
 
     docker pull parisson/timeside:latest
 
+WARNING: our docker composition already bundles some powerfull containers and bleeding edge frameworks (Nginx, MySQL, RabbitMQ, Celery, Python, Django) that can be scaled from development to massive production environments very easily. But you must modify all the passwords and secret keys of the sandbox before any serious usecase.
 
-More infos about our docker repository: https://registry.hub.docker.com/u/parisson/timeside/
+More infos about the TimeSide docker image: https://registry.hub.docker.com/u/parisson/timeside/
 
 
 Debian, Ubuntu

diff --git a/doc/source/install.rst b/doc/source/install.rst
index 00e681e9a08c80090ff077cc51520af032bf3120..5ed7f0234422564e063707637456d8bb04ed8767 100644 (file)
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -1,38 +1,33 @@
+
 Install
 =======
 
 Any platform
 --------------
 
-Thanks to Docker, TimeSide is now fully available as a docker image ready to work. The image includes all the necessary applications, modules and volumes to start your project in 5 minutes:
-
-    1. install `Git <http://git-scm.com/downloads>`_
-
-    2. install `Docker <https://docs.docker.com/installation/>`_
-
-    3. install `docker-compose <https://docs.docker.com/compose/install/>`_
-
-    4. clone TimeSide::
+Thanks to Docker, TimeSide is now fully available as a docker image ready to work. The image includes all the necessary applications, modules and volumes to start your project in a few minutes.
 
-        git clone https://github.com/Parisson/TimeSide.git
-        cd TimeSide
+First install `Git <http://git-scm.com/downloads>`_, `Docker <https://docs.docker.com/installation/>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_, then copy these commands in a terminal and hit ENTER::
 
-    5. start it up::
+    git clone https://github.com/Parisson/TimeSide.git
+    cd TimeSide
+    docker-compose up
 
-        docker-compose up
+That's it! You can now browse the TimeSide API: http://localhost:8000/api/
 
-That's it! You can now browse the TimeSide API browsing http://localhost:8000/api/
+and the admin: http://localhost:8000/admin (admin/admin)
 
-To process data by hand, you can also start a python shell session into the sandbox::
+To process some data by hand, you can also start a python shell session into the sandbox::
 
     docker-compose run app python examples/sandbox/manage.py shell
 
-To build your project on top of TimeSide, just pull our latest master image::
+To build your own audido project on top of TimeSide, just pull our latest master image::
 
     docker pull parisson/timeside:latest
 
+WARNING: our docker composition already bundles some powerfull containers and bleeding edge frameworks (Nginx, MySQL, RabbitMQ, Celery, Python, Django) that can be scaled from development to massive production environments very easily. But you must modify all the passwords and secret keys of the sandbox before any serious usecase.
 
-More infos about our docker repository: https://registry.hub.docker.com/u/parisson/timeside/
+More infos about the TimeSide docker image: https://registry.hub.docker.com/u/parisson/timeside/
 
 
 Debian, Ubuntu

diff --git a/docker-compose.yml b/docker-compose.yml
index 7f9482b49328cf3dd1fbad01392d6a2c89a3a817..29e81dc1d3f6d7c5bf9506bcb7d03c7a23c7b112 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,6 +36,14 @@ log:
     - /var/log/uwsgi
   command: /bin/true
 
+lib:
+  image: debian:wheezy
+  volumes:
+    - /var/lib/rabbitmq
+    - /var/lib/postgres
+    - /var/lib/mysql
+  command: /bin/true
+
 home:
   image: debian:wheezy
   volumes:
@@ -56,8 +64,6 @@ rabbitmq:
   image: rabbitmq:3-management
   ports:
     - "15672:15672"
-  expose:
-    - "5672"
 
 app:
   build: .