From 7570cccbba0976e9e82b494dbb164900c21e6f65 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 1 Mar 2016 17:18:18 +0100
Subject: [PATCH] use a embed volume for DB (fix OSX access rights) and make
 the install generic thanks to the docker quickstart terminal

---
 README.rst         | 45 +++++++++------------------------------------
 docker-compose.yml |  1 -
 2 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/README.rst b/README.rst
index 265a074e..c88cb870 100644
--- a/README.rst
+++ b/README.rst
@@ -8,54 +8,27 @@ This is the new template for the Manifeste festival website at IRCAM. It is base
 Install
 =========
 
-For easier development and production workflow, it has been dockerized including the MariaDB and the Nginx webserver.
+For easier development and production workflow, it has been dockerized including Django, Mezzanine, MariaDB and Nginx.
 
-First install `Git <http://git-scm.com/downloads>`_, `Docker engine <https://docs.docker.com/installation/>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_.
+On Linux, first install `Git <http://git-scm.com/downloads>`_, `Docker engine <https://docs.docker.com/installation/>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_ and open a terminal.
 
+On MacOSX or Windows install the `Docker Toolbox <https://www.docker.com/products/docker-toolbox>`_ and open a Docker Quickstart Terminal.
 
-Linux
-------
+Then run these commands::
 
-Run these commands in a terminal::
-
-    git clone --recursive git://git.forge.ircam.fr/Manifeste.git
+    git clone git://git.forge.ircam.fr/Manifeste.git
     cd Manifeste
     docker-compose up db
 
-The last command is needed to init the database. Press CTRL-C to exit. Then fire up the whole composition::
+The last command is needed to init the database. Press CTRL-C to exit, then fire up the whole composition::
 
      docker-compose up
 
-To restore the backuped database, in another terminal::
+Restore the backuped database, in another terminal (or a Docker Quickstart Terminal)::
 
     cd Manifeste
     ./scripts/restore.sh
 
-You should be able to browse the site at http://localhost:9000/
-
-
-MacOS or Windows:
-------------------
-
-Run these commands in a terminal::
-
-    docker-machine create --driver virtualbox --virtualbox-memory 8096 default
-    docker-machine start default
-    eval "$(docker-machine env default)"
-    docker-machine ip default
-    git clone --recursive git://git.forge.ircam.fr/Manifeste.git
-    cd Manifeste
-    docker-compose up db
-
-The last command is needed to init the database. Press CTRL-C to exit. Then fire up the whole composition::
-
-    docker-compose up
-
-Then, in another terminal::
-
-    eval "$(docker-machine env default)"
-    cd Manifeste
-    ./scripts/restore.sh
+Give you user password if asked.
 
-`More info <https://docs.docker.com/>`_ about using docker and related tools.
-The 3rd command should give you the IP of the VM. For example, if IP is 192.168.59.103, you should be able to browse the site at http://192.168.59.103:8010/
+You should be able to browse the app at http://localhost:8010/ (replacing 'localhost' by the IP given by the docker terminal on OSX and Windows)
diff --git a/docker-compose.yml b/docker-compose.yml
index f45898be..5ff54d90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,6 @@ data:
     - ./data/media/:/srv/media
     - ./data/static/:/srv/static
     - ./data/backup/:/srv/backup
-    - ./data/var/lib/mysql/:/var/lib/mysql
     - ./scripts/:/srv/scripts
   command: "true"
 
-- 
2.39.5