increase virtual mem for the VM, fix crash with removing local DB data

diff --git a/README.rst b/README.rst
index 1e62ff04f0771bbb173cc5ca40d40c55e6c6e26f..b36581762413d9205e17517c8e7645ca7d76e127 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -18,6 +18,10 @@ Run these commands in a terminal::
 
     git clone --recursive git://git.forge.ircam.fr/Manifeste.git
     cd Manifeste
+    docker-compose up db
+
+The last command is needed to first initialize the database. Leave the session with CTRL+C and then finally::
+
     docker-compose up
 
 Then, in another terminal::
@@ -32,11 +36,15 @@ MacOS or Windows:
 
 Run these commands in a terminal::
 
-    docker-machine create --driver virtualbox manifeste
+    docker-machine create --driver virtualbox --virtualbox-memory 8096 manifeste
     eval "$(docker-machine env manifeste)"
     docker-machine ip manifeste
     git clone --recursive git://git.forge.ircam.fr/Manifeste.git
     cd Manifeste
+    docker-compose up db
+
+The last command is needed to first initialize the database. Leave the session with CTRL+C and then finally::
+
     docker-compose up
 
 Then, in another terminal::

diff --git a/docker-compose.yml b/docker-compose.yml
index 643d6c1b40ac34f4b26d5010810e283e6750c499..a3270f4c1410db9fbc8e901064062b4007e40199 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,6 @@
 
 
 data:
-  image: debian:jessie
   image: debian:jessie
   volumes:
      - ./data/media/:/srv/media
@@ -30,10 +29,6 @@ data:
 
 db:
   image: mariadb
-  volumes:
-    # - ./app/deploy/my.cnf:/etc/mysql/my.cnf
-    - ./data/var/lib/mysql/:/var/lib/mysql
-    - ./data/var/log/mysql/:/var/log/mysql
   volumes_from:
     - data
   environment: