From 5d9d67899244f6a240379d25225270f602083ac2 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 15 Jan 2016 09:37:46 +0100 Subject: [PATCH] increase virtual mem for the VM, fix crash with removing local DB data --- README.rst | 10 +++++++++- docker-compose.yml | 5 ----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 1e62ff04..b3658176 100644 --- 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 643d6c1b..a3270f4c 100644 --- 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: -- 2.39.5